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
..
asm	Merge branch 'linus' into sched/core	2013-11-01 08:24:41 +01:00
uapi/asm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-07-14 11:42:26 -07:00