| commit | 30574b61611ccd29677989097f8c8a5d9a73d873 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Tue Oct 31 21:17:23 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Tue Oct 31 21:17:23 2006 -0800 |
| tree | 8385fb5018037402db9adb727b9755bc5b43ac92 | |
| parent | 0ca43235b34c92278fa903297acef37198ec3e26 [diff] | |
| parent | c6446a4cdadaf411bafe1565e9fa7666f3c2fe95 [diff] |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/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