summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-02-16 13:31:51 +0100
committerIngo Molnar <mingo@elte.hu>2011-02-16 13:31:55 +0100
commit48fa4b8ecf683f5e411303553da9e186e8b8406e (patch)
tree76cec4aa8cca18a44b1bd6e5be68c462a0e66d5f /Makefile
parentsched: Add yield_to(task, preempt) functionality (diff)
parentLinux 2.6.38-rc5 (diff)
downloadlinux-48fa4b8ecf683f5e411303553da9e186e8b8406e.tar.xz
linux-48fa4b8ecf683f5e411303553da9e186e8b8406e.zip
Merge commit 'v2.6.38-rc5' into sched/core
Merge reason: Pick up upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1f474953427f..5e40aa2acbff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 38
-EXTRAVERSION = -rc2
+EXTRAVERSION = -rc5
NAME = Flesh-Eating Bats with Fangs
# *DOCUMENTATION*