summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-16 08:40:57 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-16 08:40:57 -0800
commite58d4fd89aa91369357526f810c783a5acaf0cc4 (patch)
tree2ff0180423156c18ac8d7efd2b9d14712d7566c0 /drivers/pci
parenta11d9b623ea7cdcd647318bb2b3282d4c337f086 (diff)
parente4ac522bd7261829197a3d01d5feedb2aca8ae38 (diff)
downloadlinux-e58d4fd89aa91369357526f810c783a5acaf0cc4.tar.bz2
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: sata_fsl: Return non-zero on error in probe() drivers/ata/pata_ali.c: s/isa_bridge/ali_isa_bridge/ to fix alpha build libata: New driver for OCTEON SOC Compact Flash interface (v7). libata: Add another column to the ata_timing table. sata_via: Add VT8261 support pata_atiixp: update port enabledness test handling [libata] get-identity ioctl: Fix use of invalid memory pointer
Diffstat (limited to 'drivers/pci')
0 files changed, 0 insertions, 0 deletions