projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 973bec3 d557f65)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 May 2010 14:54:08 +0000 (07:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 May 2010 14:54:08 +0000 (07:54 -0700)
* 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.


Trivial merge
John Crispins staging tree