From: Linus Torvalds 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-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3e5cecf26842ecfde8ea487c02cb12709cd90ef5;p=linux-beck.git 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