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	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00