summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-13 00:34:34 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-13 00:34:34 -0400
commiteff68d452f1a6842fb05218fd93c774ffc4dbc5a (patch)
treedacd3bd93b5f9260034bb206d7182c4a2bc6fac0 /Makefile
parent6a9516989f94df10d9a27ba543c6b53b3e69c84a (diff)
parent95064a75ebf8744e1ff595e8cd7ff9b6c851523e (diff)
downloadop-kernel-dev-eff68d452f1a6842fb05218fd93c774ffc4dbc5a.zip
op-kernel-dev-eff68d452f1a6842fb05218fd93c774ffc4dbc5a.tar.gz
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c9ed7b4..eab5a8c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 18
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc7
NAME=Crazed Snow-Weasel
# *DOCUMENTATION*
OpenPOWER on IntegriCloud