diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-29 01:33:12 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-29 01:33:12 +0100 |
commit | 3d29935ff0773fe466e957f17284ca777a2aaa89 (patch) | |
tree | dcbadff76bb481124fe996e4103c138f1810e984 /arch/microblaze | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
parent | x86/PCI: remove IOH range fetching (diff) | |
download | linux-3d29935ff0773fe466e957f17284ca777a2aaa89.tar.xz linux-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 'arch/microblaze')
0 files changed, 0 insertions, 0 deletions