]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'jfs-4.10' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Dec 2016 16:30:08 +0000 (08:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Dec 2016 16:30:08 +0000 (08:30 -0800)
commit3e5cecf26842ecfde8ea487c02cb12709cd90ef5
treecf759a9527c4ed71c4671af0bedf26e5dc3a7f52
parentcdb98c2698b4af287925abcba4d77d92af82a0c3
parent362ad5d58e9ae54d15abbe4822e626be907308fe
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()