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
This commit is contained in:
Bjorn Helgaas 2012-06-13 17:04:40 -06:00
commit a187177ae0
2 changed files with 35 additions and 10 deletions