aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorPawit Pornkitprasan <p.pawit@gmail.com>2013-03-04 19:33:56 +0700
committerPawit Pornkitprasan <p.pawit@gmail.com>2013-03-04 19:33:56 +0700
commitcdf733ed16cf85e9d89ed45f0eceb060f77955fd (patch)
treed6a234e722ad2d4c25b7c8bc3640b731525d8498 /Makefile
parent1736943179733a4629e0eaa773848bdeeaeefec1 (diff)
parente28c3f2b514b5581e15614f7cf976131092cf4b6 (diff)
downloadkernel_samsung_aries-cdf733ed16cf85e9d89ed45f0eceb060f77955fd.zip
kernel_samsung_aries-cdf733ed16cf85e9d89ed45f0eceb060f77955fd.tar.gz
kernel_samsung_aries-cdf733ed16cf85e9d89ed45f0eceb060f77955fd.tar.bz2
Merge 3.0.68
Conflicts: kernel/cgroup.c Change-Id: Ibae53bbb0eafbf4d273fce805eddce3db9ca48f9
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c077b6af..4eb8f72 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 3
PATCHLEVEL = 0
-SUBLEVEL = 67
+SUBLEVEL = 68
EXTRAVERSION =
NAME = Sneaky Weasel