From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 3 May 2010 14:54:08 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=37e27e36bc416b07d853d493e6818d6a785507a2;p=openwrt%2Fstaging%2Fblogic.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: ep93xx_wdt.c fix default timout value in MODULE_PARM_DESC string.
---

37e27e36bc416b07d853d493e6818d6a785507a2