From: Linus Torvalds Date: Tue, 29 Mar 2011 18:20:09 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog X-Git-Tag: firefly_0821_release~7613^2~1732 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d6ae0c63f09cc443aa14f8b966aa3e7b2229360b;p=firefly-linux-kernel-4.4.55.git Merge git://git./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 --- d6ae0c63f09cc443aa14f8b966aa3e7b2229360b