| commit | 2c221325635ed09a6eea10a362d8514d5943ad7d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 03 15:37:27 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 03 15:37:27 2016 -0700 |
| tree | fd4f3aafa91c01be7e1cea072b2991c1f8516a92 | |
| parent | e603330c867fea506ea861892bd28d963c07c978 [diff] | |
| parent | dfc2507b26af22b0bbc85251b8545b36d8bc5d72 [diff] |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/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