summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-10 19:47:07 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-10 19:47:07 +0200
commitd5f7badb5687aa14adaf1bd945b7f4605b6d8264 (patch)
tree28a9d01bfb15f1c44627c230aa2a65912c6f53a1 /include
parentMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mch... (diff)
parentMerge branch 'fix/asoc' into for-linus (diff)
downloadlinux-d5f7badb5687aa14adaf1bd945b7f4605b6d8264.tar.xz
linux-d5f7badb5687aa14adaf1bd945b7f4605b6d8264.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Fix line-in on Mac Mini Core2 Duo ALSA: Release v1.0.20 sound: via82xx: fix DXS volume range sound: serial-u16550: fix buffer overflow ASoC: Fix errors in WM8990
Diffstat (limited to 'include')
-rw-r--r--include/sound/version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/version.h b/include/sound/version.h
index a7e74e23ad2e..456f1359e1c0 100644
--- a/include/sound/version.h
+++ b/include/sound/version.h
@@ -1,3 +1,3 @@
/* include/version.h */
-#define CONFIG_SND_VERSION "1.0.19"
+#define CONFIG_SND_VERSION "1.0.20"
#define CONFIG_SND_DATE ""