summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-03-06 14:24:21 +0100
committerTakashi Iwai <tiwai@suse.de>2015-03-06 14:24:21 +0100
commit4fda87df09bee2b1bf236aba408c3236d4f1fbca (patch)
treef1ec4a5b8696c89141bcdc25b6920b3caf5c9f97 /Makefile
parent70658b99490dd86cfdbf4fca117bbe2ef9a80d03 (diff)
parent3b8f4a70b840cff298010481d39404e9c39030d1 (diff)
Merge tag 'asoc-fix-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.0 A few driver specific fixes here, none of them earth shattering in themselves, that have accumliated since the opening of the merge window.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9fab639727c7..e6a9b1b94656 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 4
PATCHLEVEL = 0
SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
NAME = Hurr durr I'ma sheep
# *DOCUMENTATION*