Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tick-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 26 Feb 2007 19:42:10 +0000 (11:42 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 26 Feb 2007 19:42:10 +0000 (11:42 -0800)
commit5313a20bfca33ac2e15e3f6b6c8cafe806efbcc6
treec45ee8d353a21a0a98d78cf838340c928317134d
parenta7538a7f87826fb5cacc6959f00dfa9fba6f4b15
parent3494c16676a21e7e53e21b08a0a469a38df6dcfb
Merge /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.