diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-04-18 14:53:18 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-04-18 14:53:33 +0200 |
commit | 6ddafdaab3f809b110ada253d2f2d4910ebd3ac5 (patch) | |
tree | 366bb7513511a05b6e11ab89bfe3b2dbd1d62a03 /Makefile | |
parent | sched, sparc64: Turn cpu_coregroup_mask() into a real function (diff) | |
parent | sched: Remove need_migrate_task() (diff) | |
download | linux-6ddafdaab3f809b110ada253d2f2d4910ebd3ac5.tar.xz linux-6ddafdaab3f809b110ada253d2f2d4910ebd3ac5.zip |
Merge branch 'sched/locking' into sched/core
Merge reason: the rq locking changes are stable,
propagate them into the .40 queue.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 39 -EXTRAVERSION = -rc2 +EXTRAVERSION = -rc3 NAME = Flesh-Eating Bats with Fangs # *DOCUMENTATION* |