aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-04 07:27:18 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-04 07:27:18 -0400
commit947ca2e983c7f46b49dbfb5bf51d39941d39f000 (patch)
tree4a092e425960c929444d4e93a57c577c7fdb7f8c /Makefile
parent1946d6ef9d7bd4ba97094fe6eb68a9b877bde6b7 (diff)
parent6b4bfb87b638a4f114dfb6f72f4ac1be88a4ebe4 (diff)
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 739fd34a72a2..610d1c332c45 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
1VERSION = 2 1VERSION = 2
2PATCHLEVEL = 6 2PATCHLEVEL = 6
3SUBLEVEL = 30 3SUBLEVEL = 30
4EXTRAVERSION = -rc7 4EXTRAVERSION = -rc8
5NAME = Man-Eating Seals of Antiquity 5NAME = Man-Eating Seals of Antiquity
6 6
7# *DOCUMENTATION* 7# *DOCUMENTATION*