diff options
| author | Ingo Molnar <[email protected]> | 2013-11-01 07:10:58 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2013-11-01 07:24:41 +0000 |
| commit | fb10d5b7efbcc0aa9e46a9aa5ad86772c7bacb9a (patch) | |
| tree | ea284fe7b9c17a85b8d3c4ba999d6e26d51a12f6 /lib/spinlock_debug.c | |
| parent | sched: Avoid throttle_cfs_rq() racing with period_timer stopping (diff) | |
| parent | Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| download | kernel-fb10d5b7efbcc0aa9e46a9aa5ad86772c7bacb9a.tar.gz kernel-fb10d5b7efbcc0aa9e46a9aa5ad86772c7bacb9a.zip | |
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 <[email protected]>
Diffstat (limited to 'lib/spinlock_debug.c')
0 files changed, 0 insertions, 0 deletions