diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-01-30 19:28:36 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-01-30 19:28:36 +0100 |
commit | 3847b272248a3a4ed70d20392cc0454917f7713b (patch) | |
tree | 2df5f60ebf35b128bbe7509a878829236c6cfcab /kernel/sched/proc.c | |
parent | 5a5375977b721503e4d6b37ab8982902cd2d10b3 (diff) | |
parent | bb2bc55a694d45cdeda91b6f28ab2adec28125ef (diff) | |
download | talos-obmc-linux-3847b272248a3a4ed70d20392cc0454917f7713b.tar.gz talos-obmc-linux-3847b272248a3a4ed70d20392cc0454917f7713b.zip |
Merge branch 'sched/urgent' into sched/core
Merge all pending fixes and refresh the tree, before applying new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/proc.c')
0 files changed, 0 insertions, 0 deletions