aboutsummaryrefslogtreecommitdiffstats
path: root/version
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-07-18 16:22:10 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-07-18 16:22:10 -0700
commit250cf08dd42f2998b392a090cd6055c41178424e (patch)
tree9e6d85dbaa07295e9040c273846c8b42497c2bdb /version
parent9e35477be4b3d7f36f8229ae3ff173dfa8062f9d (diff)
downloadpatches-250cf08dd42f2998b392a090cd6055c41178424e.tar.gz
2.6.26-git6 - big resync/merge mess
Diffstat (limited to 'version')
-rw-r--r--version2
1 files changed, 1 insertions, 1 deletions
diff --git a/version b/version
index e760bfcb1e98b2..acc33088bc6694 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.26
+2.6.26-git6