summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2012-09-28 05:37:32 +0200
committerJames Morris <james.l.morris@oracle.com>2012-09-28 05:37:32 +0200
commitbf5308344527d015ac9a6d2bda4ad4d40fd7d943 (patch)
tree566e61e2cfc648c374d15cfc8c661b73e1a471f8 /Makefile
parentMerge branch 'for-1209' of git://gitorious.org/smack-next/kernel into next (diff)
parentLinux 3.6-rc7 (diff)
downloadlinux-bf5308344527d015ac9a6d2bda4ad4d40fd7d943.tar.xz
linux-bf5308344527d015ac9a6d2bda4ad4d40fd7d943.zip
Merge tag 'v3.6-rc7' into next
Linux 3.6-rc7 Requested by David Howells so he can merge his key susbsystem work into my tree with requisite -linus changesets.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9cc77acfc881..a3c11d589681 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
VERSION = 3
PATCHLEVEL = 6
SUBLEVEL = 0
-EXTRAVERSION = -rc2
-NAME = Saber-toothed Squirrel
+EXTRAVERSION = -rc7
+NAME = Terrified Chipmunk
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"