| commit | 804b3f9a16e446cb023417faec58b6506c834052 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Oct 03 15:44:10 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Oct 03 15:44:10 2007 -0700 |
| tree | a8886d723dc968c71cc69fcbd37b393bcf135740 | |
| parent | 3e0ca2f148f97c5748f52bcf2a69dd17cb2b1d13 [diff] | |
| parent | 991bf528f602882580d0918842b125255d246a19 [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: drivers/ata/pata_ixp4xx_cf.c: ioremap return code check Ata: pata_marvell, use ioread* for iomap-ped memory libata: fix for sata_mv >64KB DMA segments