From: Linus Torvalds Date: Tue, 11 Nov 2008 18:53:50 +0000 (-0800) Subject: Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v2.6.28-rc5~78 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f21f237cf55494c3a4209de323281a3b0528da10;p=linux-2.6-omap-h63xx.git 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: handle HRTIMER_CB_IRQSAFE_UNLOCKED correctly from softirq context nohz: disable tick_nohz_kick_tick() for now irq: call __irq_enter() before calling the tick_idle_check x86: HPET: enter hpet_interrupt_handler with interrupts disabled x86: HPET: read from HPET_Tn_CMP() not HPET_T0_CMP x86: HPET: convert WARN_ON to WARN_ON_ONCE --- f21f237cf55494c3a4209de323281a3b0528da10