diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-09-08 11:01:10 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-09-08 11:01:44 +0200 |
commit | 7fd4394dfe1db02ba904dfa1048f718cbca822d1 (patch) | |
tree | 902d159ced8c873ee8f58c3301c30f674f099a03 /Makefile | |
parent | d6cc58e127a0b7df78d869a29ff073da6fb899bb (diff) | |
parent | 7af142f752116e86adbe2073f2922d8265a77709 (diff) | |
download | op-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-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 17 SUBLEVEL = 0 -EXTRAVERSION = -rc1 +EXTRAVERSION = -rc2 NAME = Shuffling Zombie Juror # *DOCUMENTATION* |