From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 10 Jul 2012 14:36:09 +0000 (-0600)
Subject: Merge branch 'pci/bjorn-p2p-bridge-windows' into next
X-Git-Tag: v3.6-rc1~112^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ee53f4c38e70ba34777ad38807a50c1812ff36f;p=pandora-kernel.git

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
---

6ee53f4c38e70ba34777ad38807a50c1812ff36f
Reading git-diff-tree failed