| commit | 4400478ba3d939b680810aa004f1e954b4f8ba16 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 02 20:48:47 2011 -1000 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 02 20:48:47 2011 -1000 |
| tree | 416adac94a45cf935a792cd19c35cd52308e3094 | |
| parent | 0d7e92da50763b53b59b490ce57a323039ee241d [diff] | |
| parent | 7abdd34dbf58bf271db7ee6551f2ff72204a83fd [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog: watchdog: Cleanup WATCHDOG_CORE help text watchdog: Fix POST failure on ASUS P5N32-E SLI and similar boards watchdog: shwdt: fix usage of mod_timer