From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 Dec 2010 18:13:24 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: v2.6.37-rc7~18
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=46bdfe6a50b88942f5323f837a3afd93a1c86e60;p=~shefty%2Frdma-dev.git

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
---

46bdfe6a50b88942f5323f837a3afd93a1c86e60