Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6

[pandora-kernel.git] / arch / s390 / include / asm / vdso.h

diff --git a/arch/s390/include/asm/vdso.h b/arch/s390/include/asm/vdso.h
index 7bdd7c8..4a76d94 100644 (file)
--- a/arch/s390/include/asm/vdso.h
+++ b/arch/s390/include/asm/vdso.h
@@ -7,7 +7,7 @@
 #define VDSO32_LBASE   0
 #define VDSO64_LBASE   0
 
-#define VDSO_VERSION_STRING    LINUX_2.6.26
+#define VDSO_VERSION_STRING    LINUX_2.6.29
 
 #ifndef __ASSEMBLY__