summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@debian.org>2008-06-12 18:42:28 -0400
committerAndres Salomon <dilinger@debian.org>2008-06-12 18:42:28 -0400
commitf787a41d431e282723c3378e5af1a97a982eef4e (patch)
tree6d448ac341698ba4bf01321c462b655b401f8642 /Makefile
parent053f031e1671b10233bfa2dfad2ceb9fe4e25533 (diff)
parent6be2b9d741428eb461fc557e986d9921238bfb9b (diff)
downloadlwn-f787a41d431e282723c3378e5af1a97a982eef4e.tar.gz
lwn-f787a41d431e282723c3378e5af1a97a982eef4e.zip
Merge branch '2.6.25.y' into testing
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8245732f2fe1..e7bfa22d5c84 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 25
-EXTRAVERSION = .4
+EXTRAVERSION = .6
NAME = Funky Weasel is Jiggy wit it
# *DOCUMENTATION*