]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pci/gavin-window-alignment' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 11 Sep 2012 23:01:54 +0000 (17:01 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 11 Sep 2012 23:01:54 +0000 (17:01 -0600)
* 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

1  2 
include/linux/pci.h

Simple merge