aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-31 09:14:39 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-31 09:14:39 -0700
commit8ac1c101ec73e60635257ed9af1c6ab423c535b4 (patch)
treeb01a39fb1ce34e82aeea255740a5ac7ae8fb62f1 /include
parent0e9871df2389560e94ba01e40959140ee56def4b (diff)
parent672cc6c6c72673570b5ca44fe8a8b9ed604f5a4f (diff)
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: [ALSA] version 1.0.14 [ALSA] hda-codec - Fix STAC922x capture boost level [ALSA] hda-codec - Fix input with STAC92xx [ALSA] hda-codec - Fix pin configs for Gateway MX6453 [ALSA] hda-codec - Add support for MSI K9N Ultra [ALSA] hda-codec - Add quirk for Supermicro PDSBA to alc883_cfg_tbl[] [ALSA] hda-codec - Add quirk for MSI S420 [ALSA] Fix ASoC s3c24xx-pcm spinlock bug [ALSA] hda-intel: fix ASUS M2V detection [ALSA] ali5451 - Fix possible NULL dereference [ALSA] hda-codec - Add support for ASUS A8J modem [ALSA] HDA: Fix headphone mute issue on non-eapd Conexant systems [ALSA] HDA: Add more systems to Sigmatel codec [ALSA] HDA: Add support for Gateway NX860
Diffstat (limited to 'include')
-rw-r--r--include/sound/version.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/version.h b/include/sound/version.h
index 50ee4fd420f..8e5b2f0f594 100644
--- a/include/sound/version.h
+++ b/include/sound/version.h
@@ -1,3 +1,3 @@
/* include/version.h. Generated by alsa/ksync script. */
-#define CONFIG_SND_VERSION "1.0.14rc4"
-#define CONFIG_SND_DATE " (Wed May 16 09:45:46 2007 UTC)"
+#define CONFIG_SND_VERSION "1.0.14"
+#define CONFIG_SND_DATE " (Thu May 31 09:03:25 2007 UTC)"