]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d68e70c 1c97593)
Merge branch 'pci/bjorn-p2p-bridge-windows' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 10 Jul 2012 14:36:09 +0000 (08:36 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 10 Jul 2012 14:36:09 +0000 (08:36 -0600)
commit6ee53f4c38e70ba34777ad38807a50c1812ff36f
tree8a4eeef5923d28c2e4ab14f4559e686cc1fce455tree | snapshot
parentd68e70c6e59ad08feca291c2790164d3231c425ecommit | diff
parent1c975931128c1128892981095a64fb8eabf240ebcommit | 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
arch/sparc/kernel/pci.c diff1 | diff2 | blob | history
drivers/pci/probe.c diff1 | diff2 | blob | history
drivers/pci/quirks.c diff1 | diff2 | blob | history
drivers/pci/setup-bus.c diff1 | diff2 | blob | history
include/linux/pci.h diff1 | diff2 | blob | history
include/linux/pci_regs.h diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules