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

* '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

diff --cc kernel/time/clockevents.c
index 3d5fc0fd1ccac7648f743519a5851ed08c4bcb19,91db2e33d86a8fa7399e8b4bf3521cabee0f9c83..6f740d9f09485a3843086d20472c169b86c232aa
--- 1/kernel/time/clockevents.c
--- 2/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@@ -238,10 -238,11 +238,11 @@@ void clockevents_exchange_device(struc
   */
  void clockevents_notify(unsigned long reason, void *arg)
  {
-       struct list_head *node, *tmp;
+       struct clock_event_device *dev, *tmp;
        unsigned long flags;
+       int cpu;
  
 -      spin_lock_irqsave(&clockevents_lock, flags);
 +      raw_spin_lock_irqsave(&clockevents_lock, flags);
        clockevents_do_notify(reason, arg);
  
        switch (reason) {