diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-11 17:01:54 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-11 17:01:54 -0600 |
| commit | a63ab613ff48c593f4e9ace2d111978e35a202e4 (patch) | |
| tree | 067f8172d1a72625458e31869bb587eae5279b80 /drivers/scsi/sd.h | |
| parent | a690a4cbf09f70723f9721ca96ab8b2b472b3391 (diff) | |
| parent | 271fd03a3013b106ccc178d54219c1be0c9759b7 (diff) | |
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
Diffstat (limited to 'drivers/scsi/sd.h')
0 files changed, 0 insertions, 0 deletions