Files
linux/fs
Amit Pundir 839f249169 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts due to AOSP's backported commits:
    fs/f2fs/crypto.c
    fs/f2fs/crypto_fname.c
        Deleted by AOSP commit c1286ff41c ("f2fs: backport from (4c1fad64 -
        Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)")

    fs/f2fs/crypto_key.c
    fs/f2fs/data.c
    fs/f2fs/file.c
        AOSP commit 13f002354d ("f2fs: catch up to v4.14-rc1")
        override most of stable 4.4.y changes.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2017-11-20 20:53:19 +05:30
..
2017-05-14 13:32:54 +02:00
2017-10-15 23:28:32 +05:30
2017-08-06 19:19:42 -07:00
2017-06-14 13:16:24 +02:00
2017-06-14 13:16:24 +02:00
2016-11-10 16:36:34 +01:00
2017-06-14 13:16:24 +02:00
2015-11-23 21:11:08 -05:00
2017-10-08 10:14:20 +02:00
2016-10-07 15:23:47 +02:00
2017-06-14 13:16:24 +02:00
2015-11-16 23:54:45 -08:00
2017-07-15 11:57:44 +02:00
2015-08-12 15:28:45 -05:00
2016-08-10 11:49:27 +02:00
2017-06-14 13:16:24 +02:00