From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Nov 2011 17:17:30 +0000 (-0800)
Subject: Merge git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: v3.2-rc3~12
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=1b464d8429983ed56ae070f038841abfcc60b85f

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
---

1b464d8429983ed56ae070f038841abfcc60b85f