From: Bjorn Helgaas Date: Fri, 9 Nov 2012 17:00:07 +0000 (-0700) Subject: Merge branch 'pci/taku-prt-cleanup' into next X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~34^2~12 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05508270064efd674e8f2a047911dcd7776aaae0;p=pandora-kernel.git Merge branch 'pci/taku-prt-cleanup' into next * pci/taku-prt-cleanup: PCI/ACPI: Request _OSC control before scanning PCI root bus PCI: Don't pass pci_dev to pci_ext_cfg_avail() PCI/ACPI: Add _PRT interrupt routing info before enumerating devices ACPI: Pass segment/bus to _PRT add/del so they don't depend on pci_bus --- 05508270064efd674e8f2a047911dcd7776aaae0 Reading git-diff-tree failed