Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Feb 2016 19:57:24 +0000 (11:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Feb 2016 19:57:24 +0000 (11:57 -0800)
commit6a810945ed23554aa71634ff0bf976da41de9045
treea022eb43238d26f0cde3afcb93db31a6dbe46bc2
parent8ab54ed6412f42a1769cf64d4900f49a422d4292
parent0f26922fe5dc5724b1adbbd54b21bad03590b4f3
Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull timer fix from Thomas Gleixner:
 "A single fix preventing a 32bit overflow in timespec/val to cputime
  conversions on 32bit machines"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cputime: Prevent 32bit overflow in time[val|spec]_to_cputime()