Merge tag 'v3.10.101' into update

author Stricted <info@stricted.net>

Wed, 21 Mar 2018 21:52:41 +0000 (22:52 +0100)

committer Stricted <info@stricted.net>

Wed, 21 Mar 2018 21:52:41 +0000 (22:52 +0100)
author Stricted <info@stricted.net>
Wed, 21 Mar 2018 21:52:41 +0000 (22:52 +0100)
committer Stricted <info@stricted.net>
Wed, 21 Mar 2018 21:52:41 +0000 (22:52 +0100)
diff --cc Makefile
Simple merge
diff --cc include/linux/tracepoint.h
Simple merge
diff --cc kernel/module.c
Simple merge
diff --cc tools/testing/selftests/efivarfs/efivarfs.sh

index 77edcdcc016bbe9e891dbee8ce27c5824caaae63,057278448515a455a17ff2b48af2bf0902c2e7fb..057278448515a455a17ff2b48af2bf0902c2e7fb

mode 100755,100644..100755
--- 1/tools/testing/selftests/efivarfs/efivarfs.sh
--- 2/tools/testing/selftests/efivarfs/efivarfs.sh
+++ b/tools/testing/selftests/efivarfs/efivarfs.sh
author	Stricted <info@stricted.net>
	Wed, 21 Mar 2018 21:52:41 +0000 (22:52 +0100)
committer	Stricted <info@stricted.net>
	Wed, 21 Mar 2018 21:52:41 +0000 (22:52 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/tracepoint.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/module.c	patch \|	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/efivarfs/efivarfs.sh	patch \|	diff1 \|	diff2 \|	blob \| history