| commit | d006de93531a9876b26919e9d2bbf562654ab736 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 20 Sep 2011 17:24:46 +0000 (20 10:24 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 20 Sep 2011 17:24:46 +0000 (20 10:24 -0700) | ||
| tree | bc4b965e43ea446543cd2407d7bcec3efa9c09b1 | treesnapshot (tar.gz zip) |
| parent | 0ad79ed34c909205184cb85e855cdf3e17a6eac8 | commitdiff |
| parent | 4e8858d5130459c4af80b990c2280115a1d49877 | commitdiff |
Merge git://www.linux-watchdog.org/linux-watchdog
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: Initconst section fixes for watchdog
watchdog: lantiq: fix watchdogs timeout handling
watchdog: hpwdt: prevent multiple "NMI occurred" messages
watchdog: WatchDog Timer Driver Core - use passed watchdog_device
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: Initconst section fixes for watchdog
watchdog: lantiq: fix watchdogs timeout handling
watchdog: hpwdt: prevent multiple "NMI occurred" messages
watchdog: WatchDog Timer Driver Core - use passed watchdog_device