Merge commit '787f7faccfcc778c97411777b2fe5d84ea9bd1ca' into android-4.14
authorJaegeuk Kim <jaegeuk@google.com>
Mon, 30 Jul 2018 21:28:59 +0000 (14:28 -0700)
committerJaegeuk Kim <jaegeuk@google.com>
Mon, 30 Jul 2018 21:28:59 +0000 (14:28 -0700)
commit4ef89ada9e251c9a2ad28d4426179fe24af64bf0
treed1198386f68062a3ad56a57e2d69812de09e2138
parent48a0bb1ae7c68950fcfbdc922226246e83d2576b
parent787f7faccfcc778c97411777b2fe5d84ea9bd1ca
Merge commit '787f7faccfcc778c97411777b2fe5d84ea9bd1ca' into android-4.14

Synced to the latest commit for merge:
787f7faccfcc f2fs: run fstrim asynchronously if runtime discard is on

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