Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Jun 2016 22:37:27 +0000 (15:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Jun 2016 22:37:27 +0000 (15:37 -0700)
commit2c221325635ed09a6eea10a362d8514d5943ad7d
treefd4f3aafa91c01be7e1cea072b2991c1f8516a92
parente603330c867fea506ea861892bd28d963c07c978
parentdfc2507b26af22b0bbc85251b8545b36d8bc5d72
Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull timer bugfix from Thomas Gleixner:
 "A single bugfix for the error check wreckage we introduced in the
  merge window"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  time: Make settimeofday error checking work again