Skip to content
Commit d120cfb5 authored by Len Brown's avatar Len Brown
Browse files

merge linus into release branch 

Conflicts:

	drivers/acpi/acpi_memhotplug.c
parents 9dce0e95 bf7e8511
Expand all Hide whitespace changes
Inline Side-by-side
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