summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-09-30 10:24:05 +0200
committerTakashi Iwai <tiwai@suse.de>2014-09-30 10:24:05 +0200
commit5498380e4f403c0938801e2cd6683353d0029cac (patch)
treec65ab75034cac68e45da4d5bbb1513728bacec84 /Makefile
parente76bf634870e3c5e3a767ad575f1d404c9f1cab8 (diff)
parent82b925c405444b760e743b55a9ad498cb3551afe (diff)
Merge tag 'asoc-v3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.17 A few small driver specific fixes and a couple of error handling fixes in the core.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 036b7331d7b4..a192280a883d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 17
SUBLEVEL = 0
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc6
NAME = Shuffling Zombie Juror
# *DOCUMENTATION*