summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorClark Williams <williams@redhat.com>2012-02-29 09:50:56 -0600
committerClark Williams <williams@redhat.com>2012-02-29 09:50:56 -0600
commit5f269e50cb10cd1a74b89f7fda87b0c9082754f0 (patch)
tree76f82e09728bbed59baebcff2e0b008f0ab5eead /Makefile
parenta0c034c3726715d1928b301ddd43c51799c0c07a (diff)
parent1de504ea25617f701ac3a246a1c9dfd2246d4900 (diff)
Merge commit 'v3.2.8' into rt-3.2.7-rt13v3.2.8-rt13
Conflicts: arch/x86/kernel/process_32.c
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d1bdc90cb6cc..7df8a8451217 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 3
PATCHLEVEL = 2
-SUBLEVEL = 7
+SUBLEVEL = 8
EXTRAVERSION =
NAME = Saber-toothed Squirrel