From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Jul 2011 23:52:18 +0000 (-0700)
Subject: Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: MMI-PSA29.97-13-9~18909
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=112ec469663e09ffc815761254b52f3ca787ce83;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'timers-core-for-linus' of git://git./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
---

112ec469663e09ffc815761254b52f3ca787ce83