| commit | fb10d5b7efbcc0aa9e46a9aa5ad86772c7bacb9a | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Fri Nov 01 08:10:58 2013 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Fri Nov 01 08:24:41 2013 +0100 |
| tree | ea284fe7b9c17a85b8d3c4ba999d6e26d51a12f6 | |
| parent | f9f9ffc237dd924f048204e8799da74f9ecf40cf [diff] | |
| parent | 52469b4fcd4fc433ffc78cec4cf94368e9052890 [diff] |
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>