diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 19:47:46 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 19:47:46 +0100 |
| commit | 2dd550b90b03d5f236a18ae491bf6e70798469a8 (patch) | |
| tree | 5cc20d0c9f732b06aea788a78a6da9e02be5e41b /kernel | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | ata_piix.c:piix_init_one() must be __devinit (diff) | |
| download | linux-2dd550b90b03d5f236a18ae491bf6e70798469a8.tar.xz linux-2dd550b90b03d5f236a18ae491bf6e70798469a8.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions