summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2002-10-13 13:20:51 +1000
committerAnton Blanchard <anton@samba.org>2002-10-13 13:20:51 +1000
commit46aefd97c2176b08dec1965f2f937e6e35b5632a (patch)
tree21469b15fb8b58e0d3dc08b79ec688dcf206a84a
parent0ba9e8d17b4e76c7d7185c6f5ab63891c87b92d4 (diff)
parente856ba4ac9cc2c405d062c496ec125b63c502e4d (diff)
Merge samba.org:/scratch/anton/linux-2.5
into samba.org:/scratch/anton/linux-2.5_ppc64_work
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 44de8d9908bd..b3df7fb5a849 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 2
PATCHLEVEL = 5
-SUBLEVEL = 41
+SUBLEVEL = 42
EXTRAVERSION =
# *DOCUMENTATION*