From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 26 Aug 2013 21:40:03 +0000 (-0600)
Subject: Merge branch 'pci/yinghai-assign-unassigned-v6' into next
X-Git-Tag: v3.12-rc1~177^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1193725f543c92a77c73769bc2fbe48c53275f53;p=pandora-kernel.git

Merge branch 'pci/yinghai-assign-unassigned-v6' into next

* pci/yinghai-assign-unassigned-v6:
  PCI: Assign resources for hot-added host bridge more aggressively
  PCI: Move resource reallocation code to non-__init
  PCI: Delay enabling bridges until they're needed
  PCI: Assign resources on a per-bus basis
  PCI: Enable unassigned resource reallocation on per-bus basis
  PCI: Turn on reallocation for unassigned resources with host bridge offset
  PCI: Look for unassigned resources on per-bus basis
  PCI: Drop temporary variable in pci_assign_unassigned_resources()
---

1193725f543c92a77c73769bc2fbe48c53275f53
Reading git-diff-tree failed