git » linux-kernel » commit c3ed9ea

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

author Linus Torvalds
2010-05-24 14:59:17 UTC
committer Linus Torvalds
2010-05-24 14:59:17 UTC
parent 0fed2b5cb4c04336b26b0cbf6f9a8c07081f79a6
parent f00e047efdf9d31c8a7dd7875b411f97cfa7d8e5
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