aboutsummaryrefslogtreecommitdiffstats
path: root/version
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2007-02-21 14:08:12 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2007-02-21 14:08:12 -0800
commit727d36284da43b2b589680ea087804bc7e220c10 (patch)
tree6b7656daa770f99492f3b1417fdb1bbc02f84c85 /version
parent785b9427e3ee43ea5bd80c80edb4fca03520de95 (diff)
downloadpatches-727d36284da43b2b589680ea087804bc7e220c10.tar.gz
version resync with 2.6.21-rc1 and add new option device ids patch
Diffstat (limited to 'version')
-rw-r--r--version2
1 files changed, 1 insertions, 1 deletions
diff --git a/version b/version
index 03c80242978a1c..ee8220c2997929 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.20-git15
+2.6.21-rc1