Merge commit 'v2.6.29-rc1' into timers/hrtimers

Conflicts:
	kernel/time/tick-common.c

diff --cc include/linux/clockchips.h
Simple merge

diff --cc kernel/hrtimer.c
Simple merge

diff --cc kernel/time/tick-common.c
index 457d281,63e05d4..21a5ca8
--- 1/kernel/time/tick-common.c
--- 2/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@@ -274,21 -274,6 +274,21 @@@ out_bc
  }
  
  /*
-               int cpu = first_cpu(cpu_online_map);
 + * Transfer the do_timer job away from a dying cpu.
 + *
 + * Called with interrupts disabled.
 + */
 +static void tick_handover_do_timer(int *cpup)
 +{
 +      if (*cpup == tick_do_timer_cpu) {
-               tick_do_timer_cpu = (cpu != NR_CPUS) ? cpu :
++              int cpu = cpumask_first(cpu_online_mask);
 +
++              tick_do_timer_cpu = (cpu < nr_cpu_ids) ? cpu :
 +                      TICK_DO_TIMER_NONE;
 +      }
 +}
 +
 +/*
   * Shutdown an event device on a given cpu:
   *
   * This is called on a life CPU, when a CPU is dead. So we cannot