summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSrinivasarao P <spathi@codeaurora.org>2019-12-02 10:59:38 +0530
committerSrinivasarao P <spathi@codeaurora.org>2019-12-02 11:00:55 +0530
commit18d188341eb6028698349b8df17abbad05223945 (patch)
treef34239d2cd10f2dc81909e56b41a69aecfa6ada9 /Makefile
parented0754412226e593ffccb7990b18eb4914ac77e7 (diff)
parent516978792f577954ab0d362ba0b62f755e42e664 (diff)
Merge android-4.4-p.205 (5169787) into msm-4.4
* refs/heads/tmp-5169787 Linux 4.4.205 Revert "sock: Reset dst when changing sk_mark via setsockopt" Change-Id: Ie26ad8dcfbd68087b16b26e7c1004e8f2c934e66 Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 66536dea2356..30a6975cca35 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 4
-SUBLEVEL = 204
+SUBLEVEL = 205
EXTRAVERSION =
NAME = Blurry Fish Butt