aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/version.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 16:38:36 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 16:38:36 -0800
commit4da5cc2cec8caec1d357053e85a7a32f243f93a1 (patch)
tree3f8b603af4af88f86be7ec1d4e3639a7fc9dd1a6 /include/sound/version.h
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild (diff)
parent[ALSA] ad1889 - remove CVS ID from the driver identification (diff)
downloadlinux-dev-4da5cc2cec8caec1d357053e85a7a32f243f93a1.tar.xz
linux-dev-4da5cc2cec8caec1d357053e85a7a32f243f93a1.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'include/sound/version.h')
-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 d1bd3b723967..919da0dd001c 100644
--- a/include/sound/version.h
+++ b/include/sound/version.h
@@ -1,3 +1,3 @@
/* include/version.h. Generated by configure. */
-#define CONFIG_SND_VERSION "1.0.10rc3"
-#define CONFIG_SND_DATE " (Mon Nov 07 13:30:21 2005 UTC)"
+#define CONFIG_SND_VERSION "1.0.11rc2"
+#define CONFIG_SND_DATE " (Wed Jan 04 08:57:20 2006 UTC)"