aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-06-19 18:01:24 -0400
committerLen Brown <len.brown@intel.com>2006-06-19 18:01:24 -0400
commitae6c859b7dcd708efadf1c76279c33db213e3506 (patch)
treec18c2e94537d5e3d4fde5bf52800333b7c237048 /Makefile
parent5b4b7a236e7787f16af4e15a6253d46d8e794be6 (diff)
parent427abfa28afedffadfca9dd8b067eb6d36bac53f (diff)
merge linus into release branch
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a3a7baad8555..1700d3f6ea22 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
1VERSION = 2 1VERSION = 2
2PATCHLEVEL = 6 2PATCHLEVEL = 6
3SUBLEVEL = 17 3SUBLEVEL = 17
4EXTRAVERSION =-rc6 4EXTRAVERSION =
5NAME=Crazed Snow-Weasel 5NAME=Crazed Snow-Weasel
6 6
7# *DOCUMENTATION* 7# *DOCUMENTATION*