summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-04-08 11:43:30 +0200
committerIngo Molnar <mingo@kernel.org>2013-04-08 11:43:30 +0200
commit529801898b24544f93532217ce18a7ebbb2b8c4f (patch)
treec51c8fd808e6cff15cabb1a9ac29be0661942384 /Makefile
parentb847d0501afec4c7b12eb276aec10a2834f953ea (diff)
parent23995bbee01d75f09f72b1380bd6045a5b02947b (diff)
downloadlinux-529801898b24544f93532217ce18a7ebbb2b8c4f.tar.gz
linux-529801898b24544f93532217ce18a7ebbb2b8c4f.tar.bz2
linux-529801898b24544f93532217ce18a7ebbb2b8c4f.zip
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
Pull IBM zEnterprise EC12 support patchlet from Robert Richter. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6b39246c2c67..70fd27483887 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 9
SUBLEVEL = 0
-EXTRAVERSION = -rc2
+EXTRAVERSION = -rc5
NAME = Unicycling Gorilla
# *DOCUMENTATION*