summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-01-26 15:53:41 +0300
committerTakashi Iwai <tiwai@suse.de>2015-01-26 15:53:41 +0300
commit7533185eeefd087d5472422181ae8edf75118213 (patch)
tree6a62ccb019668215f70bcc9876a795548f57262a /Makefile
parentb4b33f9d64c3edcdcbea874acdc1e9626fd961f1 (diff)
parent0767e95bb96d7fdddcd590fb809e6975d93aebc5 (diff)
downloadlinux-7533185eeefd087d5472422181ae8edf75118213.tar.xz
Merge branch 'for-linus' into for-next
Sync with the latest 3.19-rc state for applying other ALSA sequencer core fixes.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e41a3356abee..95a0e827ecd3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 19
SUBLEVEL = 0
-EXTRAVERSION = -rc4
+EXTRAVERSION = -rc6
NAME = Diseased Newt
# *DOCUMENTATION*