From c4ab8ab4e1e1e4e8f4e608e2c334642eb225055c Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Fri, 26 Feb 2010 22:37:54 +0100
Subject: [PATCH] --- yaml --- r: 182187 b: refs/heads/master c:
 13c6680acb3df25722858566b42759215ea5d2e0 h: refs/heads/master i:   182185:
 3ba331e5c0274937b9070f692e2acc37141739ff   182183:
 449cb2385a385298cf6c97c4cdff91bc8377ae10 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/s390/include/asm/vdso.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7bdcb2124ae8..a5e5af05d64d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1844c9bc0b2fed3023551c1affe033ab38e90b9a
+refs/heads/master: 13c6680acb3df25722858566b42759215ea5d2e0
diff --git a/trunk/arch/s390/include/asm/vdso.h b/trunk/arch/s390/include/asm/vdso.h
index 7bdd7c8ebc91..4a76d9480cce 100644
--- a/trunk/arch/s390/include/asm/vdso.h
+++ b/trunk/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__