diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-10 16:36:09 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-10 16:36:09 +0200 |
| commit | 6ee53f4c38e70ba34777ad38807a50c1812ff36f (patch) | |
| tree | 8a4eeef5923d28c2e4ab14f4559e686cc1fce455 /drivers/pci/hotplug/acpiphp_glue.c | |
| parent | Merge branch 'pci/bjorn-disable-decode' into next (diff) | |
| parent | sparc/PCI: replace pci_cfg_fake_ranges() with pci_read_bridge_bases() (diff) | |
| download | linux-6ee53f4c38e70ba34777ad38807a50c1812ff36f.tar.xz linux-6ee53f4c38e70ba34777ad38807a50c1812ff36f.zip | |
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
Diffstat (limited to 'drivers/pci/hotplug/acpiphp_glue.c')
0 files changed, 0 insertions, 0 deletions