summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-23 08:37:23 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-23 08:37:23 -0700
commit101e4d91f5e8c78d64970c03323d942d6706320f (patch)
treece0e6a0a172ee9fbe638a60c124512bac8373dbc /include
parent2f2c2679893c963bd90c5e1c0669b97fd87d1c4a (diff)
parent9efbf95f6204da0112371f41e63c7330f94e1042 (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.15 [ALSA] hda-codec - Fix possible array overflow [ALSA] sound/core/control.c: hard-irq-safe -> hard-irq-unsafe lock warning [ALSA] usb-audio: Another USB mic quirk for Logitech Communicator webcam [ALSA] hda-codec - Fix build without CONFIG_SND_HDA_GENERIC [ALSA] hda-codec - Fix Conexant 5045 volumes [ALSA] hda-codec - Fix conflict of Master volume in STAC92xx codec [ALSA] snd-bt87x: Make the load_all option work correctly [ALSA] protect Dreamcast PCM driver (AICA) from G2 bus effects [ALSA] bt87x - Fix section mismatch [ALSA] hda-codec - Fix AD1986A Lenovo auto-mute [ALSA] This simplifies and fixes waiting loops of the mce_down()
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 8d4a8dd8923..a2be8ad8894 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.15"
-#define CONFIG_SND_DATE " (Tue Oct 16 14:57:44 2007 UTC)"
+#define CONFIG_SND_DATE " (Tue Oct 23 06:09:18 2007 UTC)"