From: Linus Torvalds <torvalds@woody.linux-foundation.org>
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-Tag: v2.6.21-rc2~43
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5313a20bfca33ac2e15e3f6b6c8cafe806efbcc6;p=linux-2.6-omap-h63xx.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