summaryrefslogtreecommitdiffstats
path: root/drivers/pci/quirks.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-12 17:17:09 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-12 17:17:09 -0800
commit80ef913f5e6a84551545016cea709f5e96d0cda6 (patch)
tree61796333896ac4878b47c825f8027c70bb3b8e19 /drivers/pci/quirks.c
parent1c32ca9f63d2a103dd33eae72e5aff53a23fe650 (diff)
parentf2543790875b088e2a58aa12ee1ac20a75d6126d (diff)
downloadlinux-80ef913f5e6a84551545016cea709f5e96d0cda6.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: drivers/ata/pata_octeon_cf.c: delete double assignment pata_legacy: fix CONFIG_PATA_WINBOND_VLB_MODULE test libata: fix NULL sdev dereference race in atapi_qc_complete()
Diffstat (limited to 'drivers/pci/quirks.c')
0 files changed, 0 insertions, 0 deletions