tree ea284fe7b9c17a85b8d3c4ba999d6e26d51a12f6
parent f9f9ffc237dd924f048204e8799da74f9ecf40cf
parent 52469b4fcd4fc433ffc78cec4cf94368e9052890
author Ingo Molnar <mingo@kernel.org> 1383289858 +0100
committer Ingo Molnar <mingo@kernel.org> 1383290681 +0100

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>