Ingo Molnar 8c5db92a70 Merge branch 'linus' into locking/core, to resolve conflicts ... Conflicts: include/linux/compiler-clang.h include/linux/compiler-gcc.h include/linux/compiler-intel.h include/uapi/linux/stddef.h Signed-off-by: Ingo Molnar <mingo@kernel.org>		2017-11-07 10:32:44 +01:00
..
asm	Merge branch 'linus' into locking/core, to resolve conflicts	2017-11-07 10:32:44 +01:00
uapi/asm	tools/headers: Synchronize kernel ABI headers	2017-11-04 09:27:46 +01:00