tree c8978186da2155f7752de79a2cd5b59e3e298ce8
parent ecd5907a200b18aeddac68b8c734b8ad4c931205
parent cf1e367ee84e02ac349ad0858eb65e8a6a511c8b
author Linus Torvalds <torvalds@linux-foundation.org> 1261244838 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1261244838 -0800

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

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  timers: Remove duplicate setting of new_base in __mod_timer()
  clockevents: Prevent clockevent_devices list corruption on cpu hotplug