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
cris
frv
h8300
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
metag	Merge branch 'linus' into locking/core, to resolve conflicts	2017-11-07 10:32:44 +01:00
microblaze
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
openrisc
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
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
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