| commit | 6ee53f4c38e70ba34777ad38807a50c1812ff36f | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Tue Jul 10 08:36:09 2012 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Tue Jul 10 08:36:09 2012 -0600 |
| tree | 8a4eeef5923d28c2e4ab14f4559e686cc1fce455 | |
| parent | d68e70c6e59ad08feca291c2790164d3231c425e [diff] | |
| parent | 1c975931128c1128892981095a64fb8eabf240eb [diff] |
Merge branch 'pci/bjorn-p2p-bridge-windows' into next * pci/bjorn-p2p-bridge-windows: sparc/PCI: replace pci_cfg_fake_ranges() with pci_read_bridge_bases() PCI: support sizing P2P bridge I/O windows with 1K granularity PCI: reimplement P2P bridge 1K I/O windows (Intel P64H2) PCI: allow P2P bridge windows starting at PCI bus address zero Conflicts: drivers/pci/probe.c include/linux/pci.h