diff options
| author | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-05-20 09:56:37 +0530 |
|---|---|---|
| committer | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-05-20 09:56:37 +0530 |
| commit | 869cf3be9976f56aa25ad7176f32c0acef3c605f (patch) | |
| tree | f0bb66e62d73884cf6275206b3c806bb27162658 /Makefile | |
| parent | 69c9cbc86b5d9f8da1c085bc8f84930d2d73b2c9 (diff) | |
| parent | ae101a35196a14a8388b7db5f7ddd0b3cfdc5f99 (diff) | |
| download | kernel_samsung_aries-869cf3be9976f56aa25ad7176f32c0acef3c605f.zip kernel_samsung_aries-869cf3be9976f56aa25ad7176f32c0acef3c605f.tar.gz kernel_samsung_aries-869cf3be9976f56aa25ad7176f32c0acef3c605f.tar.bz2 | |
Merge branch 'linux-3.0.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into HEAD
Conflicts:
sound/soc/codecs/wm8994.c
Change-Id: Ic34584ecfad51ba86cd9e31accf98a23db597920
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 = 78 +SUBLEVEL = 79 EXTRAVERSION = NAME = Sneaky Weasel |