tree dcbadff76bb481124fe996e4103c138f1810e984
parent 474118d06d1d5053f27450224f0541219483ec69
parent e8e06eae4ffd683931b928f460c11c40cd3f7fd8
author Linus Torvalds <torvalds@linux-foundation.org> 1264725192 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1264725192 -0800

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