tree cbff778a0cc10732958384d24a26e5fde08867c5
parent f16a5e347835c6a0ba958535cf6e6c89d50463b8
parent bb2fd8a844d3a9209599b5fb694b30ac46a56ef0
author Linus Torvalds <torvalds@linux-foundation.org> 1274812840 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1274812840 -0700

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