From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 7 Nov 2012 22:53:33 +0000 (-0700)
Subject: Merge branch 'pci/taku-prt-cleanup' into next
X-Git-Tag: next-20121108~85^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ab79640e201ea5929e9cb603289536e049e57a7f;p=karo-tx-linux.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
---

ab79640e201ea5929e9cb603289536e049e57a7f