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
..
alpha/include	License cleanup: add SPDX license identifier to uapi header files with no license	2017-11-02 11:19:54 +01:00
arc/include/uapi/asm	License cleanup: add SPDX license identifier to uapi header files with no license	2017-11-02 11:19:54 +01:00
arm/include	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
arm64/include	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
frv/include/uapi/asm	License cleanup: add SPDX license identifier to uapi header files with no license	2017-11-02 11:19:54 +01:00
h8300/include	License cleanup: add SPDX license identifier to uapi header files with no license	2017-11-02 11:19:54 +01:00
hexagon/include/uapi/asm	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
ia64/include	License cleanup: add SPDX license identifier to uapi header files with no license	2017-11-02 11:19:54 +01:00
m32r/include/uapi/asm	License cleanup: add SPDX license identifier to uapi header files with no license	2017-11-02 11:19:54 +01:00
microblaze/include/uapi/asm	License cleanup: add SPDX license identifier to uapi header files with no license	2017-11-02 11:19:54 +01:00
mips/include	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
mn10300/include/uapi/asm	License cleanup: add SPDX license identifier to uapi header files with no license	2017-11-02 11:19:54 +01:00
parisc/include/uapi/asm	License cleanup: add SPDX license identifier to uapi header files with no license	2017-11-02 11:19:54 +01:00
powerpc/include	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
s390/include	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
score/include/uapi/asm	License cleanup: add SPDX license identifier to uapi header files with no license	2017-11-02 11:19:54 +01:00
sh/include	License cleanup: add SPDX license identifier to uapi header files with no license	2017-11-02 11:19:54 +01:00
sparc/include	License cleanup: add SPDX license identifier to uapi header files with no license	2017-11-02 11:19:54 +01:00
tile/include	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
x86	Merge branch 'linus' into locking/core, to resolve conflicts	2017-11-07 10:32:44 +01:00
xtensa/include	License cleanup: add SPDX license identifier to uapi header files with no license	2017-11-02 11:19:54 +01:00