| commit | 30574b61611ccd29677989097f8c8a5d9a73d873 | |
| author | Linus Torvalds <torvalds@g5.osdl.org> | |
| Wed, 1 Nov 2006 05:17:23 +0000 (31 21:17 -0800) | ||
| committer | Linus Torvalds <torvalds@g5.osdl.org> | |
| Wed, 1 Nov 2006 05:17:23 +0000 (31 21:17 -0800) | ||
| tree | 8385fb5018037402db9adb727b9755bc5b43ac92 | treesnapshot (tar.gz zip) |
| parent | 0ca43235b34c92278fa903297acef37198ec3e26 | commitdiff |
| parent | c6446a4cdadaf411bafe1565e9fa7666f3c2fe95 | commitdiff |
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[PATCH] ata_piix: allow 01b MAP for both ICH6M and ICH7M
[PATCH] libata: unexport ata_dev_revalidate()
[PATCH] Add 0x7110 piix to ata_piix.c
[PATCH] sata_sis: fix flags handling for the secondary port
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[PATCH] ata_piix: allow 01b MAP for both ICH6M and ICH7M
[PATCH] libata: unexport ata_dev_revalidate()
[PATCH] Add 0x7110 piix to ata_piix.c
[PATCH] sata_sis: fix flags handling for the secondary port