summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2009-08-06 01:56:54 +0400
committerRafael J. Wysocki <rjw@sisk.pl>2009-08-06 01:56:54 +0400
commitc00aafcd4977769e8728292302ddbbb8b1082fab (patch)
tree5766bcfbfd7b24816b54298b8ef34054f8cf0fae /Makefile
parent2e6713c7662cc5ebc7346b033c404cb2f708fd51 (diff)
parent90bc1a658a53f8832ee799685703977a450e5af9 (diff)
downloadlinux-c00aafcd4977769e8728292302ddbbb8b1082fab.tar.xz
Merge branch 'master' into for-linus
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 063d738405ed..0d46615bffe5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 31
-EXTRAVERSION = -rc4
+EXTRAVERSION = -rc5
NAME = Man-Eating Seals of Antiquity
# *DOCUMENTATION*