summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-02-13 16:20:07 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2012-02-13 16:20:07 +0100
commit654b0c9627bc1b34cc21643afa8ac359c50db7d7 (patch)
treef25069e2987e6d61793585adf969f42f9380afcd /Makefile
parentd031e1de2c5ba91e67ed83f6adf624543ab2b03d (diff)
parentd020283dc694c9ec31b410f522252f7a8397e67d (diff)
downloadop-kernel-dev-654b0c9627bc1b34cc21643afa8ac359c50db7d7.zip
op-kernel-dev-654b0c9627bc1b34cc21643afa8ac359c50db7d7.tar.gz
Merge commit 'pm-fixes-for-3.3-rc3' into pm-qos
New material in the pm-qos branch depends on recent power management fixes.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 71e6ed2..e3b23e8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 3
SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
NAME = Saber-toothed Squirrel
# *DOCUMENTATION*
OpenPOWER on IntegriCloud