tree 9fe5add84d9bcca4670b1af98940d7267c3a3571
parent c15524a40a1603dc56a8691c4f50172fb86c23d8
parent a2c606d53ab71dee6410f10ef0adf67321d60e06
author Linus Torvalds <torvalds@linux-foundation.org> 1292696004 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1292696004 -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: avoid high BIOS area when allocating address space
  x86: avoid E820 regions when allocating address space
  x86: avoid low BIOS area when allocating address space
  resources: add arch hook for preventing allocation in reserved areas
  Revert "resources: support allocating space within a region from the top down"
  Revert "PCI: allocate bus resources from the top down"
  Revert "x86/PCI: allocate space from the end of a region, not the beginning"
  Revert "x86: allocate space within a region top-down"
  Revert "PCI: fix pci_bus_alloc_resource() hang, prefer positive decode"
  PCI: Update MCP55 quirk to not affect non HyperTransport variants