Ingo Molnar f407a82586 Merge branch 'linus' into sched/core, to resolve conflict ... Conflicts: arch/sparc/include/asm/topology_64.h Signed-off-by: Ingo Molnar <mingo@kernel.org>		2015-06-02 08:05:42 +02:00
..
boot	alpha: Fix bootpfile and bootpzfile make targets	2015-05-26 10:01:50 -07:00
include	alpha: Wire up all missing implemented syscalls	2015-05-26 10:01:50 -07:00
kernel	alpha: kernel: osf_sys: Set 'kts.tv_nsec' only when 'tv' has effect	2015-05-26 10:01:51 -07:00
lib	alpha: fix broken network checksum	2014-01-31 09:21:55 -08:00
math-emu	alpha: change to new Makefile flag variables	2011-01-17 05:42:13 +01:00
mm	mm/fault, arch: Use pagefault_disable() to check for disabled pagefaults in the handler	2015-05-19 08:39:15 +02:00
oprofile	alpha: delete non-required instances of <linux/init.h>	2015-05-26 10:01:48 -07:00
defconfig	defconfig reduction	2010-08-14 22:26:53 +02:00
Kconfig	alpha: expose number of page table levels on Kconfig level	2015-04-14 16:49:01 -07:00
Kconfig.debug	alpha/parisc: remove config variable DEBUG_RWLOCK	2008-02-06 10:41:03 -08:00
Makefile	alpha: makefile: don't enforce small data model for kernel builds	2013-04-07 12:59:30 -07:00