From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 1 Nov 2013 07:10:58 +0000 (+0100)
Subject: Merge branch 'linus' into sched/core
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~40^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb10d5b7efbcc0aa9e46a9aa5ad86772c7bacb9a;p=pandora-kernel.git

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:

  52469b4fcd4f 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>
---

fb10d5b7efbcc0aa9e46a9aa5ad86772c7bacb9a
Reading git-diff-tree failed