Merge branch 'topic/kong-acpiphp-remove' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 13 Jun 2012 23:04:40 +0000 (17:04 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 13 Jun 2012 23:04:40 +0000 (17:04 -0600)
* 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


Trivial merge