tree 4cafc47b8eaed5d40b2d8705c9f9036fe6b463d3
parent d9e80b7de91db05c1c4d2e5ebbfd70b3b3ba0e0f
parent 48728e077480910df45baabc5f87b04276348c90
author Linus Torvalds <torvalds@linux-foundation.org> 1272512417 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1272512417 -0700

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: compute Address Space length rather than using _LEN
  x86/PCI: never allocate PCI MMIO resources below BIOS_END