Merge remote-tracking branch 'integrity/next-integrity'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 03:59:36 +0000 (14:59 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 03:59:36 +0000 (14:59 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 03:59:36 +0000 (14:59 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 03:59:36 +0000 (14:59 +1100)
diff --cc include/linux/efi.h
Simple merge
diff --cc tools/testing/selftests/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 03:59:36 +0000 (14:59 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 03:59:36 +0000 (14:59 +1100)
		1	2
include/linux/efi.h	patch \|	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history