parent e25ba0ce039d1c5cae0b0057e4b9e228dc6744bd
parent 20403e845f9988446c5b48024ff4d0c3a5929f7d
author Linus Torvalds <torvalds@linux-foundation.org> 1321982250 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1321982250 -0800

Merge git://www.linux-watchdog.org/linux-watchdog

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: fix initialisation printout in s3c2410_wdt
  watchdog: Don't overwrite error value in wm831x_wdt_set_timeout()
  watchdog: adx_wdt.c: remove driver
#;´ôš.x