diff options
author | Srinivasarao P <spathi@codeaurora.org> | 2019-12-02 10:59:38 +0530 |
---|---|---|
committer | Srinivasarao P <spathi@codeaurora.org> | 2019-12-02 11:00:55 +0530 |
commit | 18d188341eb6028698349b8df17abbad05223945 (patch) | |
tree | f34239d2cd10f2dc81909e56b41a69aecfa6ada9 /Makefile | |
parent | ed0754412226e593ffccb7990b18eb4914ac77e7 (diff) | |
parent | 516978792f577954ab0d362ba0b62f755e42e664 (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-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 204 +SUBLEVEL = 205 EXTRAVERSION = NAME = Blurry Fish Butt |