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

Merge branch 'linus' into sfi-release 



Conflicts:
	arch/x86/kernel/setup.c
	drivers/acpi/power.c
	init/main.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 3834f472 78f28b7c
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