]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3200c0d f9a5ac1)
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)
commitd23ca5a3a0d72e5013330110278c3cd62168098e
treeea284fe7b9c17a85b8d3c4ba999d6e26d51a12f6tree | snapshot
parent3200c0d6ef23b500a2a272bbc5f1665525b575e5commit | diff
parentf9a5ac17f0bcfcecd8c10d7d9aff452a213cdff7commit | 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:

  f9a5ac17f0bc 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.