| commit | 8718d75ef23e858a6b947f5b1a43094acf3b6e23 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Mar 19 20:12:25 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Mar 19 20:12:25 2007 -0700 |
| tree | a9f3bc7766b60ac45303188e12f18f5a7b010eb9 | |
| parent | f32e3555834c4bc95fccba1aa245d95b3a0a0bc8 [diff] | |
| parent | 282c6b9c7a344ce6436bb61a006b9c2a373b9626 [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: pata_ixp4xx_cf: fix interrupt pata_ixp4xx_cf: fix oops on detach libata: kernel-doc fix sata_inic162x: kill double region requests drivers/ata/Kconfig: PATA_SCC depends on wrong platform sata_sil24: Add Adaptec 1220SA PCI ID libata: don't whine if ->prereset() returns -ENOENT