Merge branch 'linus'; commit 'v3.0-rc2' into next

[~andy/linux] / Makefile

diff --git a/Makefile b/Makefile
index 529d93fa2430282bda65da27258dfff8091b1be9..0f1db8d9074124cddd1a71d627031ed674fd4e0a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-VERSION = 2
-PATCHLEVEL = 6
-SUBLEVEL = 39
-EXTRAVERSION =
-NAME = Flesh-Eating Bats with Fangs
+VERSION = 3
+PATCHLEVEL = 0
+SUBLEVEL = 0
+EXTRAVERSION = -rc2
+NAME = Sneaky Weasel
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"