tree 235949da80e61fe6d1b9d2da02705c3dda64f58f
parent 1dc2c2919d44c7490bc080fff0439fb0c28dc1dc
parent 0d347d1faad20f477fd9dbb3f2c56d288cc43cf6
author Jaegeuk Kim <jaegeuk@google.com> 1559144646 -0700
committer Jaegeuk Kim <jaegeuk@google.com> 1559144646 -0700

Merge remote-tracking branch 'origin/upstream-f2fs-stable-linux-4.9.y' into android-4.9

* origin/upstream-f2fs-stable-linux-4.9.y:
  f2fs: link f2fs quota ops for sysfile

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