diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-03-29 12:48:15 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-03-29 12:48:22 +0200 |
commit | 1f56ee7b68fecd45d25bdcf2eda7507797594424 (patch) | |
tree | 782ec71491cdfb0ce5d5117428be6c3af7070207 /virt | |
parent | sched: Fix __schedule_bug() output when called from an interrupt (diff) | |
parent | sched/arch: Introduce the finish_arch_post_lock_switch() scheduler callback (diff) | |
download | linux-1f56ee7b68fecd45d25bdcf2eda7507797594424.tar.xz linux-1f56ee7b68fecd45d25bdcf2eda7507797594424.zip |
Merge branch 'sched/arch' into sched/urgent
Merge reason: It has not gone upstream via the ARM tree, merge it via
the scheduler tree.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions