1
0
Fork 0
alistair23-linux/arch
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 Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
arc Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
arm Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
arm64 Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
blackfin Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
c6x License cleanup: add SPDX license identifier to uapi header files with a license 2017-11-02 11:20:11 +01:00
cris License cleanup: add SPDX license identifier to uapi header files with no license 2017-11-02 11:19:54 +01:00
frv License cleanup: add SPDX license identifier to uapi header files with a license 2017-11-02 11:20:11 +01:00
h8300 License cleanup: add SPDX license identifier to uapi header files with no license 2017-11-02 11:19:54 +01:00
hexagon Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
ia64 Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
m32r Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
m68k License cleanup: add SPDX license identifier to uapi header files with a license 2017-11-02 11:20:11 +01:00
metag Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
microblaze License cleanup: add SPDX license identifier to uapi header files with a license 2017-11-02 11:20:11 +01:00
mips Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
mn10300 Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
nios2 License cleanup: add SPDX license identifier to uapi header files with a license 2017-11-02 11:20:11 +01:00
openrisc License cleanup: add SPDX license identifier to uapi header files with a license 2017-11-02 11:20:11 +01:00
parisc Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
powerpc Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
s390 Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
score License cleanup: add SPDX license identifier to uapi header files with no license 2017-11-02 11:19:54 +01:00
sh Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
sparc Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
tile Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
um Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
unicore32 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 Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
.gitignore
Kconfig License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00