From: Linus Torvalds Date: Mon, 26 Feb 2007 19:42:10 +0000 (-0800) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tick-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5313a20bfca33ac2e15e3f6b6c8cafe806efbcc6;p=linux-beck.git Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tick-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/tick-2.6: [TICK] tick-common: Fix one-shot handling in tick_handle_periodic(). [TIME] tick-sched: Add missing asm/irq_regs.h include. --- 5313a20bfca33ac2e15e3f6b6c8cafe806efbcc6