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

* origin/upstream-f2fs-stable-linux-4.4.y:
  Revert "f2fs: use timespec64 for inode timestamps"

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

diff --cc fs/f2fs/f2fs.h
Simple merge

diff --cc fs/f2fs/namei.c
Simple merge