summaryrefslogtreecommitdiff
path: root/include/sound/version.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-03-30 10:47:19 +0400
committerIngo Molnar <mingo@kernel.org>2012-03-30 10:50:06 +0400
commit186e54cbe1145f4d11e32fe10e7e20a11f1b27dd (patch)
tree9b6cf3667a3ea90e0cec0ea7119688ba76c55a71 /include/sound/version.h
parent99dd5497e5be4fe4194cad181d45fd6569a930db (diff)
parent4bde23f8751f388867766b0a62ed1ef8b7e01561 (diff)
downloadlinux-186e54cbe1145f4d11e32fe10e7e20a11f1b27dd.tar.xz
Merge branch 'linus' into x86/urgent
Merge reason: Needed for include file dependencies. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/sound/version.h')
-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 8fc5321e1ecc..cc75024c1089 100644
--- a/include/sound/version.h
+++ b/include/sound/version.h
@@ -1,3 +1,3 @@
/* include/version.h */
-#define CONFIG_SND_VERSION "1.0.24"
+#define CONFIG_SND_VERSION "1.0.25"
#define CONFIG_SND_DATE ""