diff options
author | Amit Pundir <amit.pundir@linaro.org> | 2017-08-17 14:18:51 +0530 |
---|---|---|
committer | Amit Pundir <amit.pundir@linaro.org> | 2017-08-17 14:18:51 +0530 |
commit | db5bc601e46abbb8fc4c17a6bc848c560e80fe57 (patch) | |
tree | b1eb723eb8acd5261336cef1b968311e6332a7b6 /Makefile | |
parent | d98f3af5986fae62bacbe7e83026660d61621a3a (diff) | |
parent | 21b5f5d91a589931a22009d918fd319f481e8eee (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
fs/f2fs/super.c
Pick changes from LTS commit 76517ed2a7fe
("f2fs: sanity check checkpoint segno and blkoff"),
over changes from AOSP commit 0f127e451bc7
("FROMLIST: f2fs: sanity check checkpoint segno and blkoff")
Signed-off-by: Amit Pundir <amit.pundir@linaro.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 = 80 +SUBLEVEL = 82 EXTRAVERSION = NAME = Blurry Fish Butt |