summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-09-08 11:01:10 +0200
committerTakashi Iwai <tiwai@suse.de>2014-09-08 11:01:44 +0200
commit7fd4394dfe1db02ba904dfa1048f718cbca822d1 (patch)
tree902d159ced8c873ee8f58c3301c30f674f099a03 /Makefile
parentd6cc58e127a0b7df78d869a29ff073da6fb899bb (diff)
parent7af142f752116e86adbe2073f2922d8265a77709 (diff)
downloadop-kernel-dev-7fd4394dfe1db02ba904dfa1048f718cbca822d1.zip
op-kernel-dev-7fd4394dfe1db02ba904dfa1048f718cbca822d1.tar.gz
Merge branch 'topic/pcm-nonatomic' into for-next
This is a merge for exending PCM ops to be non-atomic.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e432442..f64fc78 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 17
SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
NAME = Shuffling Zombie Juror
# *DOCUMENTATION*
OpenPOWER on IntegriCloud