aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-10-21 00:54:21 -0700
committerDavid S. Miller <davem@davemloft.net>2010-10-21 00:54:21 -0700
commit4c2a1b86644a6f3fc6b788d3a591563aff71f836 (patch)
treef615b0d88e2039ebc0ada2daf5009411f43febb9 /Makefile
parente2269308359d5863b6aa1fcb95a425a2ab255f1f (diff)
parentf6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff)
downloadkernel_samsung_crespo-4c2a1b86644a6f3fc6b788d3a591563aff71f836.zip
kernel_samsung_crespo-4c2a1b86644a6f3fc6b788d3a591563aff71f836.tar.gz
kernel_samsung_crespo-4c2a1b86644a6f3fc6b788d3a591563aff71f836.tar.bz2
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 77b5c6e..860c26a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 36
-EXTRAVERSION = -rc7
-NAME = Sheep on Meth
+EXTRAVERSION =
+NAME = Flesh-Eating Bats with Fangs
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"