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)
commita187177ae047e005a7b40229555837a529a9c2cc
treef5b56902875f1f9e4e9ea9baa0dfc35e22d54b05
parent4d17e8516a0b24240cd3f5d024b2ca10cb0b5208
parentce29ca3ea40744f24c2b5d88431e8ac566d257cc
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