]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jul 2011 23:52:18 +0000 (16:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jul 2011 23:52:18 +0000 (16:52 -0700)
commit112ec469663e09ffc815761254b52f3ca787ce83
tree18a7d2300dc10b7c2c994107681dffc927589701
parenta99a7d1436f9375662f35ccac8f1a1e1b0302a11
parentcbaa51524b3224813814607177a00c350ee35d12
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  time: Fix stupid KERN_WARN compile issue
  rtc: Avoid accumulating time drift in suspend/resume
  time: Avoid accumulating time drift in suspend/resume
  time: Catch invalid timespec sleep values in __timekeeping_inject_sleeptime