diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-14 03:04:40 +0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-14 03:04:40 +0400 |
commit | a187177ae047e005a7b40229555837a529a9c2cc (patch) | |
tree | f5b56902875f1f9e4e9ea9baa0dfc35e22d54b05 /drivers/pci/pci.c | |
parent | 4d17e8516a0b24240cd3f5d024b2ca10cb0b5208 (diff) | |
parent | ce29ca3ea40744f24c2b5d88431e8ac566d257cc (diff) | |
download | linux-a187177ae047e005a7b40229555837a529a9c2cc.tar.xz |
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
Diffstat (limited to 'drivers/pci/pci.c')
0 files changed, 0 insertions, 0 deletions