summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-10 13:43:09 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-10 13:43:09 -0400
commita7144b23da073f4b3192e356ad74de12aba60e00 (patch)
tree2b93bdf54563bfe447a167d832c43d24f56c7a95 /Makefile
parent8a60a07129fad60bba779a2a4038c7518b167fc7 (diff)
parent86b3786078d63242d3194ffc58ae8dae1d1bbef3 (diff)
downloadtalos-op-linux-a7144b23da073f4b3192e356ad74de12aba60e00.tar.gz
talos-op-linux-a7144b23da073f4b3192e356ad74de12aba60e00.zip
Merge /spare/repo/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 717b9b9192d5..2c1486159d8d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 13
-EXTRAVERSION =-rc4
+EXTRAVERSION =-rc6
NAME=Woozy Numbat
# *DOCUMENTATION*
OpenPOWER on IntegriCloud