Files
linux/scripts
Amit Pundir 84e1d70f12 Merge commit '73450231ffff' into android-4.4
Synced to the latest commit for merge:
73450231ff f2fs: run fstrim asynchronously if runtime discard is on

Change-Id: Icec09d14f2768dfaa1a0691eac275f68adbf470b
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>

Conflicts:
    fs/crypto/fscrypt_private.h
    fs/crypto/keyinfo.c
    fs/f2fs/data.c
    fs/f2fs/f2fs.h
    fs/f2fs/namei.c
    fs/f2fs/segment.c
    fs/f2fs/super.c
    include/uapi/linux/fs.h
        Resolved conflicts based on android-4.4:fs/f2fs codebase.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2018-10-04 13:44:14 +05:30
..
2005-04-16 15:20:36 -07:00
2014-08-20 16:03:45 +02:00
2014-08-20 16:03:45 +02:00
2011-08-31 16:12:17 +02:00
2014-08-20 16:03:45 +02:00
2014-08-20 16:03:45 +02:00
2014-08-20 16:03:45 +02:00
2012-06-27 12:44:29 -07:00
2010-03-23 12:26:38 +01:00
2014-12-20 00:01:12 +01:00
2016-03-03 15:07:12 -08:00
2014-08-20 16:03:45 +02:00
2014-08-20 16:03:45 +02:00
2005-04-16 15:20:36 -07:00
2015-08-28 17:04:40 +02:00
2015-08-28 17:04:40 +02:00
2014-08-20 16:03:45 +02:00