Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Aug 2015 18:25:01 +0000 (11:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Aug 2015 18:25:01 +0000 (11:25 -0700)
Pull arm64 fix from Catalin Marinas:
 "Fix coarse clock monotonicity (VDSO timestamp off by one jiffy
  compared to the syscall one)"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: VDSO: fix coarse clock monotonicity regression


Trivial merge