summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-03 02:46:01 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-03 02:46:01 +0200
commit0ed537b5fd18c38b526fd0e6837a00f96aee30c4 (patch)
tree01744d89b09aaaaad77696265fb4732ef9a8fc32 /Makefile
parent72e624de6e6f0d5a638fbc23842aa76ae048e9e7 (diff)
parent50a3cb04a5f9cd5323a76db9ee409a7f3004259a (diff)
downloadlinux-rt-0ed537b5fd18c38b526fd0e6837a00f96aee30c4.tar.gz
Merge branch 'pm-opp' into pm-cpufreq
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index afabc44a349b..e79448d90f19 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 4
PATCHLEVEL = 2
SUBLEVEL = 0
-EXTRAVERSION = -rc4
+EXTRAVERSION = -rc5
NAME = Hurr durr I'ma sheep
# *DOCUMENTATION*