From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Aug 2011 06:48:47 +0000 (-1000)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog
X-Git-Tag: upstream/snapshot3+hdmi~9394
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4400478ba3d939b680810aa004f1e954b4f8ba16;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge git://git./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
---

4400478ba3d939b680810aa004f1e954b4f8ba16