| commit | 3e5cecf26842ecfde8ea487c02cb12709cd90ef5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 14 08:30:08 2016 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 14 08:30:08 2016 -0800 |
| tree | cf759a9527c4ed71c4671af0bedf26e5dc3a7f52 | |
| parent | cdb98c2698b4af287925abcba4d77d92af82a0c3 [diff] | |
| parent | 362ad5d58e9ae54d15abbe4822e626be907308fe [diff] |
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()