diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 14:42:10 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 14:42:10 -0500 |
| commit | 5313a20bfca33ac2e15e3f6b6c8cafe806efbcc6 (patch) | |
| tree | c45ee8d353a21a0a98d78cf838340c928317134d /fs/jfs | |
| parent | a7538a7f87826fb5cacc6959f00dfa9fba6f4b15 (diff) | |
| parent | 3494c16676a21e7e53e21b08a0a469a38df6dcfb (diff) | |
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.
Diffstat (limited to 'fs/jfs')
0 files changed, 0 insertions, 0 deletions