tree 18a7d2300dc10b7c2c994107681dffc927589701
parent a99a7d1436f9375662f35ccac8f1a1e1b0302a11
parent cbaa51524b3224813814607177a00c350ee35d12
author Linus Torvalds <torvalds@linux-foundation.org> 1311378738 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1311378738 -0700

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