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

Merge branch 'acpi-modparam' into release 



Conflicts:
	drivers/acpi/Makefile

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 7c27fd19 ae7d5151
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