Browse Source

Merge branch 'acpi-hotplug' into acpi-pci-hotplug

Conflicts:
	drivers/acpi/scan.c
Rafael J. Wysocki 11 years ago
parent
commit
b169ba5ae4

Diff Data Not Available.