From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Dec 2016 16:30:08 +0000 (-0800)
Subject: Merge tag 'jfs-4.10' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: v4.10-rc1~133
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/3e5cecf26842ecfde8ea487c02cb12709cd90ef5

Merge tag 'jfs-4.10' of git://github.com/kleikamp/linux-shaggy

Pull jfs update from David Kleikamp:
 "The jfs piece of the current_time() series"

* tag 'jfs-4.10' of git://github.com/kleikamp/linux-shaggy:
  fs: jfs: Replace CURRENT_TIME_SEC by current_time()
---

3e5cecf26842ecfde8ea487c02cb12709cd90ef5