diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-11 14:26:40 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-11 14:26:40 -0400 |
| commit | 7569c43e4d3fbb0ef1a8db0db3c1d77111bf26ed (patch) | |
| tree | f8ce42e62b68b03ae90594830e58390930e8d780 /sound | |
| parent | 6ee53f4c38e70ba34777ad38807a50c1812ff36f (diff) | |
| parent | 2ac45f28b8eeef576c48579833b40b572f3f9790 (diff) | |
Merge branch 'pci/yinghai-hotplug-cleanup' into next
* pci/yinghai-hotplug-cleanup:
PCI: acpiphp: merge acpiphp_debug and debug
PCI: acpiphp: remove unused res_lock
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions