summaryrefslogtreecommitdiff
path: root/drivers/parport/multiface.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 18:47:46 (GMT)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 18:47:46 (GMT)
commit2dd550b90b03d5f236a18ae491bf6e70798469a8 (patch)
tree5cc20d0c9f732b06aea788a78a6da9e02be5e41b /drivers/parport/multiface.h
parent8755e568250ecd3149ecd3495d8070f3a5384f73 (diff)
parentbc5468f52b785ffa1fe0ea289baec2c51384d436 (diff)
downloadlinux-2dd550b90b03d5f236a18ae491bf6e70798469a8.tar.xz
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 'drivers/parport/multiface.h')
0 files changed, 0 insertions, 0 deletions