summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2007-01-09 09:40:34 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2007-01-09 09:40:34 -0800
commit656829e2d052b1da4a72aa2ac39ad733a78530ce (patch)
treedd94ceb1177bc56302dbf21b94def49a92b26c20 /include
parent76a2f047880c2c7779f8950c50ee8f3855a5e6df (diff)
parenta037b0a43f6abafc4f725f7c7f46d577d1c44c96 (diff)
downloadlinux-3.10-656829e2d052b1da4a72aa2ac39ad733a78530ce.tar.gz
linux-3.10-656829e2d052b1da4a72aa2ac39ad733a78530ce.tar.bz2
linux-3.10-656829e2d052b1da4a72aa2ac39ad733a78530ce.zip
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.14rc1 [ALSA] usbaudio - Fix kobject_add() error at reconnection [ALSA] usb: usbmixer error path fix [ALSA] _snd_cmipci_uswitch_put doesn't set zero flags [ALSA] hda-codec - Fix NULL dereference in generic hda code [ALSA] hda_intel: ALSA HD Audio patch for Intel ICH9 [ALSA] usb-audio: work around wrong frequency in CM6501 descriptors [ALSA] Fix potential NULL pointer dereference in echoaudio midi [ALSA] Audio: Add nvidia HD Audio controllers of MCP67 support to hda_intel.c
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 2949b9b991b..20f7babad51 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.14rc1"
-#define CONFIG_SND_DATE " (Wed Dec 20 08:11:48 2006 UTC)"
+#define CONFIG_SND_DATE " (Tue Jan 09 09:56:17 2007 UTC)"