From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 11 Sep 2012 23:01:54 +0000 (-0600)
Subject: Merge branch 'pci/gavin-window-alignment' into next
X-Git-Tag: v3.7-rc1~177^2~10
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a63ab613ff48c593f4e9ace2d111978e35a202e4;p=linux.git

Merge branch 'pci/gavin-window-alignment' into next

* pci/gavin-window-alignment:
  powerpc/powernv: I/O and memory alignment for P2P bridges
  powerpc/PCI: Override pcibios_window_alignment()
  PCI: Refactor pbus_size_mem()
  PCI: Align P2P windows using pcibios_window_alignment()
  PCI: Add weak pcibios_window_alignment() interface
---

a63ab613ff48c593f4e9ace2d111978e35a202e4