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:
  hrtimer: splitout peek ahead functionality, fix
  hrtimer: fixup comments
  hrtimer: fix recursion deadlock by re-introducing the softirq
  hrtimer: simplify hotplug migration
  hrtimer: fix HOTPLUG_CPU=n compile warning
  hrtimer: splitout peek ahead functionality

diff --combined include/linux/interrupt.h
index af886b26c9d1d638cc78d93830b07a8e0cfb8816,2062833f5f7a8bddc374b05f778492c0bb5e00bb..9127f6b51a39a0fac962030a1cedde2cdadd13b7
--- 1/include/linux/interrupt.h
--- 2/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@@ -14,6 -14,7 +14,6 @@@
  #include <linux/irqflags.h>
  #include <linux/smp.h>
  #include <linux/percpu.h>
 -#include <linux/irqnr.h>
  
  #include <asm/atomic.h>
  #include <asm/ptrace.h>
@@@ -252,7 -253,8 +252,8 @@@ enu
        BLOCK_SOFTIRQ,
        TASKLET_SOFTIRQ,
        SCHED_SOFTIRQ,
-       RCU_SOFTIRQ,    /* Preferable RCU should always be the last softirq */
+       HRTIMER_SOFTIRQ,
+       RCU_SOFTIRQ,    /* Preferable RCU should always be the last softirq */
  
        NR_SOFTIRQS
  };