diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 20:40:40 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 20:40:40 +0200 |
| commit | 51e618c357b39597b474165c5d17067afe8f16a6 (patch) | |
| tree | cbff778a0cc10732958384d24a26e5fde08867c5 /include | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes (diff) | |
| parent | watchdog: Driver for the watchdog timer on Freescale IMX2 (and later) process... (diff) | |
| download | linux-51e618c357b39597b474165c5d17067afe8f16a6.tar.xz linux-51e618c357b39597b474165c5d17067afe8f16a6.zip | |
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: Driver for the watchdog timer on Freescale IMX2 (and later) processors.
watchdog: s3c2410_wdt - Fix on handling of the request_mem_region fail
watchdog: s3c2410_wdt - Add extra option to include watchdog for Samsung SoCs
iTCO_wdt: fix TCO V1 timeout values and limits
watchdog: twl4030_wdt: Disable watchdog during probing
watchdog: update/improve/consolidate watchdog driver
watchdog: booke_wdt: fix ioctl status flags
watchdog: fix several MODULE_PARM_DESC strings
watchdog: bfin: use new common Blackfin watchdog header
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions