summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-04-25 08:59:16 +0200
committerIngo Molnar <mingo@kernel.org>2012-04-25 08:59:16 +0200
commit3dbe927b1eddcbd66da1653168e33122aca84f4e (patch)
tree2357f4c55156597b1d07b9ea360b07086cd011e4 /Makefile
parenta385ec4f11bdcf81af094c03e2444ee9b7fad2e5 (diff)
parent66f75a5d028beaf67c931435fdc3e7823125730c (diff)
downloadtalos-op-linux-3dbe927b1eddcbd66da1653168e33122aca84f4e.tar.gz
talos-op-linux-3dbe927b1eddcbd66da1653168e33122aca84f4e.zip
Merge tag 'v3.4-rc4' into perf/core
Merge v3.4-rc4 - we were on -rc2 before. 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 f7f738117128..2280dff31b62 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 4
SUBLEVEL = 0
-EXTRAVERSION = -rc2
+EXTRAVERSION = -rc4
NAME = Saber-toothed Squirrel
# *DOCUMENTATION*
OpenPOWER on IntegriCloud