summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-07-06 15:35:18 -0700
committerTony Luck <tony.luck@intel.com>2005-07-06 15:35:18 -0700
commit67d340f440f389e9d56201fb7c7aaa92f262feb1 (patch)
treea96c26a370beb23282a561ddd936e5d0aa93adde /Makefile
parent2ba3e3e65cf182436757ba13ea8d564e2950fb56 (diff)
parent159f597a8bd0f1d7650d5e580c93a2666c9c26d1 (diff)
downloadop-kernel-dev-67d340f440f389e9d56201fb7c7aaa92f262feb1.zip
op-kernel-dev-67d340f440f389e9d56201fb7c7aaa92f262feb1.tar.gz
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 77aab7b..278d509 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 13
-EXTRAVERSION =-rc1
+EXTRAVERSION =-rc2
NAME=Woozy Numbat
# *DOCUMENTATION*
OpenPOWER on IntegriCloud