Commit 69cd291c authored by Len Brown's avatar Len Brown
Browse files

Pull acpi_bus_register_driver into release branch

Conflicts:

	drivers/acpi/asus_acpi.c
	drivers/acpi/scan.c
parents 35a5d9ed 06ea8e08
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment