| commit | 2dd550b90b03d5f236a18ae491bf6e70798469a8 | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Wed, 6 Feb 2008 18:47:46 +0000 (6 10:47 -0800) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Wed, 6 Feb 2008 18:47:46 +0000 (6 10:47 -0800) | ||
| tree | 5cc20d0c9f732b06aea788a78a6da9e02be5e41b | treesnapshot (tar.gz zip) |
| parent | 8755e568250ecd3149ecd3495d8070f3a5384f73 | commitdiff |
| parent | bc5468f52b785ffa1fe0ea289baec2c51384d436 | commitdiff |
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
ata_piix.c:piix_init_one() must be __devinit
sata_via.c: Remove missleading comment.
libata-core: unblacklist HITACHI drives
sata_nv: fix ATAPI issues with memory over 4GB (v7)
ata: drivers/ata/sata_mv.c needs dmapool.h
libata: kill now unused n_iter and fix sata_fsl
ahci: fix CAP.NP and PI handling
sata_mv: Support SoC controllers
Rename: linux/pata_platform.h to linux/ata_platform.h
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
ata_piix.c:piix_init_one() must be __devinit
sata_via.c: Remove missleading comment.
libata-core: unblacklist HITACHI drives
sata_nv: fix ATAPI issues with memory over 4GB (v7)
ata: drivers/ata/sata_mv.c needs dmapool.h
libata: kill now unused n_iter and fix sata_fsl
ahci: fix CAP.NP and PI handling
sata_mv: Support SoC controllers
Rename: linux/pata_platform.h to linux/ata_platform.h