]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e1cb22a 363c3f9)
Merge branch 'linus' into sched/core
authorIngo Molnar <mingo@kernel.org>
Fri, 1 Nov 2013 07:10:58 +0000 (08:10 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 1 Nov 2013 07:24:41 +0000 (08:24 +0100)
commitcf6b73ff72d1af412c52541fa926b6985d5961dc
treeea284fe7b9c17a85b8d3c4ba999d6e26d51a12f6tree | snapshot
parente1cb22a3aef0e1777752481ec620e0b1c22a2e5fcommit | diff
parent363c3f9e057cefb08243991c6dcd9183ed35500acommit | 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:

  363c3f9e057c 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>
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/include/asm/Kbuild diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
mm/huge_memory.c diff1 | diff2 | blob | history
mm/memory.c diff1 | diff2 | blob | history
mm/migrate.c diff1 | diff2 | blob | history
mm/mprotect.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.