aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-28 16:33:12 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-28 16:33:12 -0800
commit3d29935ff0773fe466e957f17284ca777a2aaa89 (patch)
treedcbadff76bb481124fe996e4103c138f1810e984 /include
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parentx86/PCI: remove IOH range fetching (diff)
downloadlinux-dev-3d29935ff0773fe466e957f17284ca777a2aaa89.tar.xz
linux-dev-3d29935ff0773fe466e957f17284ca777a2aaa89.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: x86/PCI: remove IOH range fetching PCI: fix nested spinlock hang in aer_inject
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions