Merge branch 'linus' into tracing/mmiotrace-mergefixups

[net-next-2.6.git] / Makefile

diff --git a/Makefile b/Makefile
index b4a273f19b52dcbd07c4f148e59392f83c1dac1b..db164f69cffa0a57f641bd8a4518af27d9c1c7bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 26
-EXTRAVERSION = -rc3
-NAME = Funky Weasel is Jiggy wit it
+EXTRAVERSION = -rc6
+NAME = Rotary Wombat
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"