Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Jan 2010 00:33:12 +0000 (16:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Jan 2010 00:33:12 +0000 (16:33 -0800)
commit3d29935ff0773fe466e957f17284ca777a2aaa89
treedcbadff76bb481124fe996e4103c138f1810e984
parent474118d06d1d5053f27450224f0541219483ec69
parente8e06eae4ffd683931b928f460c11c40cd3f7fd8
Merge branch 'for-linus' of git://git./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