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
..
boot	xtensa: don't use echo -e needlessly	2013-09-06 09:48:29 -07:00
configs	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
include	sched, arch: Create asm/preempt.h	2013-09-25 14:07:50 +02:00
kernel	xtensa: don't use alternate signal stack on threads	2013-10-15 13:39:16 -07:00
lib	xtensa: clean up files to make them code-style compliant	2012-12-18 21:10:25 -08:00
mm	arch: mm: pass userspace fault flag to generic fault handler	2013-09-12 15:38:01 -07:00
oprofile	xtensa: fix oprofile building as module	2013-05-09 01:07:09 -07:00
platforms	xtensa: Cocci spatch "noderef"	2013-10-16 11:48:31 -07:00
variants	xtensa: consolidate ccount access routines	2013-07-08 01:11:37 -07:00
Kconfig	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
Kconfig.debug	xtensa: check TLB sanity on return to userspace	2013-07-08 01:18:56 -07:00
Makefile	xtensa: don't use echo -e needlessly	2013-09-06 09:48:29 -07:00