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

Browse source

Conflicts:
	drivers/acpi/scan.c

...

This commit is contained in:

Rafael J. Wysocki 2014-02-06 17:32:41 +01:00

parent 1f7c164b6f 8fcfb99c8e

commit b169ba5ae4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available