Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / include / sound / version.h

diff --git a/include/sound/version.h b/include/sound/version.h
index d1bd3b7239670952d0fca8cc23b9367280e24273..2ee849d0e198dc20c4afb1b5e26d203272de2e20 100644 (file)
--- 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.12rc1"
+#define CONFIG_SND_DATE " (Thu Jun 22 13:55:50 2006 UTC)"