diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 20:42:10 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 20:42:10 +0100 |
| commit | 5313a20bfca33ac2e15e3f6b6c8cafe806efbcc6 (patch) | |
| tree | c45ee8d353a21a0a98d78cf838340c928317134d /fs/jfs/jfs_logmgr.h | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 (diff) | |
| parent | [TICK] tick-common: Fix one-shot handling in tick_handle_periodic(). (diff) | |
| download | linux-5313a20bfca33ac2e15e3f6b6c8cafe806efbcc6.tar.xz linux-5313a20bfca33ac2e15e3f6b6c8cafe806efbcc6.zip | |
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/jfs_logmgr.h')
0 files changed, 0 insertions, 0 deletions