Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / Makefile

diff --git a/Makefile b/Makefile
index fbb8dfc063d36070bc8b3336e7f696d0b15d3d61..8f08a29539eac8f779870f9596ddfcdecdc1e777 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 24
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc7
 NAME = Arr Matey! A Hairy Bilge Rat!
 
 # *DOCUMENTATION*