diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 17:32:45 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 17:32:45 -0800 |
commit | cba5a641ca7887dc371486681dac887869d1c7b7 (patch) | |
tree | 0f083cfdec8c72657ccf90c2bab3f288027b68bf /include | |
parent | 9f6632d6290785caf9e9f874c0a0cfaf2c178e59 (diff) | |
parent | 6185af1f4254a53563fe6d6af652f5775fc70e25 (diff) | |
download | op-kernel-dev-cba5a641ca7887dc371486681dac887869d1c7b7.zip op-kernel-dev-cba5a641ca7887dc371486681dac887869d1c7b7.tar.gz |
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.14rc3
[ALSA] cmipci - Allow to disable integrated FM port
[ALSA] hda-codec - Fix logic error in headphone mute for Conexant codecs
[ALSA] hda-codec - Add missing Mic Boost for AD1986A codec
[ALSA] ac97 - Add Thinkpad X31 and R40 to AD1981x blacklist
[ALSA] Add missing sysfs device assignment for ALSA PCI drivers
[ALSA] hda-codec - Define pin configs for MacBooks
[ALSA] hda-codec - Add missing Mic Boost controls for ALC262
[ALSA] soc - WM9712 PCM volume
[ALSA] soc - Fix WM9712 register cache entry
[ALSA] hda-codec - Add method for configuring Mac Pro without PCI SSID
[ALSA] hda-codec - Add LFE support on Dell M90
Diffstat (limited to 'include')
-rw-r--r-- | include/sound/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/version.h b/include/sound/version.h index a9ba7ee..5f72750 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.14rc2" -#define CONFIG_SND_DATE " (Wed Feb 14 07:42:13 2007 UTC)" +#define CONFIG_SND_VERSION "1.0.14rc3" +#define CONFIG_SND_DATE " (Tue Mar 06 13:10:00 2007 UTC)" |