aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-18 13:50:44 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-18 13:50:44 -0400
commit98ae6878f151b0b508b09a36367c231b707a88cf (patch)
treed6fdd23d6f78d0713ac6290c75bf39c2a65c12c7 /include
parentb720a3be1abd0cb5b9b530c0a1b4044fec4de60e (diff)
parent5f1545bc45a33361d6bb2fb44af7c35bcd733b9d (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] hda-intel - Fix HDA buffer alignment [ALSA] hda-codec - Add model for HP Compaq d5750 [ALSA] hda-codec - Add support for MacBook Pro 1st generation [ALSA] version 1.0.14rc3 [ALSA] hda-codec - Add model for HP Compaq d5700 [ALSA] intel8x0 - Fix Oops at kdump crash kernel [ALSA] hda-codec - Fix speaker output on MacPro [ALSA] hda-codec - more systems for Analog Devices [ALSA] hda-intel - Fix codec probe with ATI contorllers [ALSA] hda-codec - Add suppoprt for Asus M2N-SLI motherboard [ALSA] intel8x0 - Fix speaker output after S2RAM [ALSA] ac97 - fix AD shared shared jack control logic [ALSA] soc - Fix dependencies in Kconfig files
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 5f7275000102..42a18cc95f38 100644
--- a/include/sound/version.h
+++ b/include/sound/version.h
@@ -1,3 +1,3 @@
1/* include/version.h. Generated by alsa/ksync script. */ 1/* include/version.h. Generated by alsa/ksync script. */
2#define CONFIG_SND_VERSION "1.0.14rc3" 2#define CONFIG_SND_VERSION "1.0.14rc3"
3#define CONFIG_SND_DATE " (Tue Mar 06 13:10:00 2007 UTC)" 3#define CONFIG_SND_DATE " (Wed Mar 14 07:25:50 2007 UTC)"