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
..
boot	parisc: Unbreak bootloader due to gcc-7 optimizations	2017-09-22 22:26:43 +02:00
configs	net: Remove CONFIG_NETFILTER_DEBUG and _ASSERT() macros.	2017-09-04 13:25:20 +02:00
include	Merge branch 'linus' into locking/core, to resolve conflicts	2017-11-07 10:32:44 +01:00
kernel	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
lib	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
math-emu	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mm	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
oprofile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
defpalo.conf	parisc: switch to gzip-compressed vmlinuz kernel	2013-07-09 22:09:20 +02:00
install.sh	parisc: make "make install" not depend on vmlinux	2013-11-07 22:28:06 +01:00
Kconfig	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Kconfig.debug	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile	parisc: Reintroduce option to gzip-compress the kernel	2017-09-22 22:26:41 +02:00
nm