Ingo Molnar fb10d5b7ef Merge branch 'linus' into sched/core ... Resolve cherry-picking conflicts: Conflicts: mm/huge_memory.c mm/memory.c mm/mprotect.c See this upstream merge commit for more details: 52469b4fcd Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Signed-off-by: Ingo Molnar <mingo@kernel.org>		2013-11-01 08:24:41 +01:00
..
drivers	um: Cleanup SIGTERM handling	2013-09-07 10:56:58 +02:00
include	sched, arch: Create asm/preempt.h	2013-09-25 14:07:50 +02:00
kernel	uml: check length in exitcode_proc_write()	2013-10-30 12:24:49 -07:00
os-Linux	um: Run UML in it's own session.	2013-09-07 10:57:07 +02:00
scripts	um: Preinclude include/linux/kern_levels.h	2012-09-27 20:20:09 +02:00
sys-ia64	uml: remove useless comments	2009-04-01 08:59:17 -07:00
sys-ppc	dump_stack: unify debug information printed by show_regs()	2013-04-30 17:04:02 -07:00
.gitignore	um: tell git to ignore generated files	2010-03-06 11:26:28 -08:00
defconfig	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
Kconfig.char	um: clean Kconfig up a bit	2011-11-02 14:15:29 +01:00
Kconfig.common	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Kconfig.net	arch/um: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:38:04 -08:00
Kconfig.rest	um: switch to use of drivers/Kconfig	2011-11-02 14:15:41 +01:00
Kconfig.um	arch/um: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:38:04 -08:00
Makefile	UAPI: Partition the header include path sets and add uapi/ header directories	2012-10-02 18:01:26 +01:00
Makefile-ia64	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile-os-Linux	x86, um: get rid of arch/um/os symlink	2008-10-22 22:55:22 -07:00
Makefile-ppc	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile-skas	[PATCH] uml makefiles sanitized	2005-09-29 08:46:26 -07:00