From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 6 Aug 2013 20:57:23 +0000 (-0600)
Subject: Merge branch 'pci/wei-resource-cleanups' into next
X-Git-Tag: v3.12-rc1~177^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3ec221b9370e964b9e001788bc68766469191a5;p=pandora-kernel.git

Merge branch 'pci/wei-resource-cleanups' into next

* pci/wei-resource-cleanups:
  PCI: Align bridge I/O windows as required by downstream devices & bridges
  PCI: Fix types in pbus_size_io()
  PCI: Add comments for pbus_size_mem() parameters
  PCI: Enumerate subordinate buses, not devices, in pci_bus_get_depth()
---

e3ec221b9370e964b9e001788bc68766469191a5
Reading git-diff-tree failed