aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-06-06 10:10:07 -0600
committerGrant Likely <grant.likely@secretlab.ca>2011-06-06 10:10:07 -0600
commit8c31b1635b91e48f867e010cd7bcd06393e5858a (patch)
tree4981add7e38e24724d255dedeb03f93be34d33ec /Makefile
parent121a2dd860f8348fb014b660f133a0cb9a16273e (diff)
parent2ce420da39078a6135d1c004a0e4436fdc1458b4 (diff)
downloadlinux-8c31b1635b91e48f867e010cd7bcd06393e5858a.tar.gz
Merge branch 'gpio/next-mx' into gpio/next
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index afb8e0d26f2c..0f1db8d90741 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 0
SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
NAME = Sneaky Weasel
# *DOCUMENTATION*