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

Pull timer fixes from Ingo Molnar.

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource : Nomadik-mtu : fix missing irq initialization
  posix-timer: Don't call idr_find() with out-of-range ID

diff --cc drivers/clocksource/nomadik-mtu.c
index 435e54d,7cbcaa0..071f6ea
--- 1/drivers/clocksource/nomadik-mtu.c
--- 2/drivers/clocksource/nomadik-mtu.c
+++ b/drivers/clocksource/nomadik-mtu.c
@@@ -240,9 -226,6 +240,10 @@@ void __init nmdk_timer_init(void __iome
        /* Timer 1 is used for events, register irq and clockevents */
        setup_irq(irq, &nmdk_timer_irq);
        nmdk_clkevt.cpumask = cpumask_of(0);
+       nmdk_clkevt.irq = irq;
        clockevents_config_and_register(&nmdk_clkevt, rate, 2, 0xffffffffU);
 +
 +      mtu_delay_timer.read_current_timer = &nmdk_timer_read_current_timer;
 +      mtu_delay_timer.freq = rate;
 +      register_current_timer_delay(&mtu_delay_timer);
  }