From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 May 2010 14:59:17 +0000 (-0700)
Subject: Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.35-rc1~413
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3ed9ea4ab460080dea9449c709be9316c670c72;p=thirdparty%2Flinux.git

Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  timers: Fix slack calculation for expired timers
  timekeeping: Fix timezone update
---

c3ed9ea4ab460080dea9449c709be9316c670c72