Merge tag 'nios2-v4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Apr 2018 23:02:18 +0000 (16:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Apr 2018 23:02:18 +0000 (16:02 -0700)
commitb82b6813ff8fd741c3061c4a754ded898b69ab28
tree0f50a5a8ac27522a4b4a08a0427a75fce5716604
parent8837c70d531a1788f975c366c254a5cb973a5291
parent3d9644ef9a0f6c3ca0c1bd2aea1d82e7ea0a7f24
Merge tag 'nios2-v4.17-rc1' of git://git./linux/kernel/git/lftan/nios2

Pull nios2 update from Ley Foon Tan:
 "Use read_persistent_clock64() instead of read_persistent_clock()"

* tag 'nios2-v4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
  nios2: Use read_persistent_clock64() instead of read_persistent_clock()