Merge branch 'linus' into efi/core, to refresh the branch and to pick up recent fixes

author Ingo Molnar <[email protected]>

Wed, 3 Feb 2016 10:30:36 +0000 (11:30 +0100)

committer Ingo Molnar <[email protected]>

Wed, 3 Feb 2016 10:30:36 +0000 (11:30 +0100)
author Ingo Molnar <[email protected]>
Wed, 3 Feb 2016 10:30:36 +0000 (11:30 +0100)
committer Ingo Molnar <[email protected]>
Wed, 3 Feb 2016 10:30:36 +0000 (11:30 +0100)
diff --cc arch/x86/mm/pageattr.c
Simple merge
diff --cc arch/x86/platform/efi/quirks.c
Simple merge
diff --cc drivers/firmware/efi/efi.c
Simple merge
author	Ingo Molnar <[email protected]>
	Wed, 3 Feb 2016 10:30:36 +0000 (11:30 +0100)
committer	Ingo Molnar <[email protected]>
	Wed, 3 Feb 2016 10:30:36 +0000 (11:30 +0100)
		1	2
arch/x86/mm/pageattr.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/efi/quirks.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/firmware/efi/efi.c	patch \|	diff1 \|	diff2 \|	blob \| history