Merge branch 'linus' into x86/boot, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2017-01-28 09:30:11 +01:00
parent f28442497b 1b1bc42c16
commit 9a1f4150fe
1070 changed files with 10713 additions and 6450 deletions
--- a/arch/x86/boot/string.c
+++ b/arch/x86/boot/string.c
@@ -14,6 +14,7 @@

 #include <linux/types.h>
 #include "ctype.h"
+#include "string.h"

 int memcmp(const void *s1, const void *s2, size_t len)
 {