| commit | 37e27e36bc416b07d853d493e6818d6a785507a2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 03 07:54:08 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 03 07:54:08 2010 -0700 |
| tree | bb7a5f5f187dace341878e9e2d638550dd0ea102 | |
| parent | 973bec34bfc1bc2465646181653d67f767d418c8 [diff] | |
| parent | d557f651b3617b46ed18d5bac48a851df1dbf684 [diff] |
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.