diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2012-06-13 17:04:40 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-13 17:04:40 -0600 |
| commit | a187177ae047e005a7b40229555837a529a9c2cc (patch) | |
| tree | f5b56902875f1f9e4e9ea9baa0dfc35e22d54b05 /net/tipc | |
| parent | Merge branch 'topic/yinghai-busn-alloc' into next (diff) | |
| parent | PCI: acpiphp: remove all functions in slot, even without ACPI _EJx (diff) | |
| download | linux-dev-a187177ae047e005a7b40229555837a529a9c2cc.tar.xz linux-dev-a187177ae047e005a7b40229555837a529a9c2cc.zip | |
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 'net/tipc')
0 files changed, 0 insertions, 0 deletions