diff options
author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-04 19:33:56 +0700 |
---|---|---|
committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-04 19:33:56 +0700 |
commit | cdf733ed16cf85e9d89ed45f0eceb060f77955fd (patch) | |
tree | d6a234e722ad2d4c25b7c8bc3640b731525d8498 /Makefile | |
parent | 1736943179733a4629e0eaa773848bdeeaeefec1 (diff) | |
parent | e28c3f2b514b5581e15614f7cf976131092cf4b6 (diff) | |
download | kernel_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-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 67 +SUBLEVEL = 68 EXTRAVERSION = NAME = Sneaky Weasel |