From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 13 Jun 2012 23:04:40 +0000 (-0600)
Subject: Merge branch 'topic/kong-acpiphp-remove' into next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a187177ae047e005a7b40229555837a529a9c2cc;p=deliverable%2Flinux.git

Merge branch 'topic/kong-acpiphp-remove' into next

* topic/kong-acpiphp-remove:
  PCI: acpiphp: remove all functions in slot, even without ACPI _EJx
  PCI: acpiphp: fix function 0 leak when disabling a slot
---

a187177ae047e005a7b40229555837a529a9c2cc