]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commiteaea826f9f62a966c4fa691ffd4da672fe2afcf6
treebb7a5f5f187dace341878e9e2d638550dd0ea102
parentf2a2dfa9d1b6403dcc03e3365440edcf34eb3853
parentbe376b4bc24442491bd070d122a491e8b6e3bb3b
Merge git://git.kernel.org/pub/scm/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.