diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-29 11:20:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-29 11:20:09 -0700 |
| commit | d6ae0c63f09cc443aa14f8b966aa3e7b2229360b (patch) | |
| tree | 13e3da32cc3c9ab5c32dde93164c7ce363e76a74 /arch/frv/include/asm/system.h | |
| parent | 8c82840e5414259b1963da36f82b64a755fafc75 (diff) | |
| parent | 7fff4beb311dfab4f18ff2cd64f78ec89296a39a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
watchdog: softdog.c: enhancement to optionally invoke panic instead of reboot on timer expiry
watchdog: fix nv_tco section mismatch
watchdog: sp5100_tco.c: Check if firmware has set correct value in tcobase.
watchdog: Convert release_resource to release_region/release_mem_region
watchdog: s3c2410_wdt.c: Convert release_resource to release_region/release_mem_region
Diffstat (limited to 'arch/frv/include/asm/system.h')
0 files changed, 0 insertions, 0 deletions