From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Jan 2013 01:46:14 +0000 (-0800)
Subject: Merge git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: v3.8-rc2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef05e9b9602660fd468e05f5fbe8f08ad7418b73;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

Pull watchdog fixes from Wim Van Sebroeck:
 "This fixes some small errors in the new da9055 driver, eliminates a
  compiler warning and adds DT support for the twl4030_wdt driver (so
  that we can have multiple watchdogs with DT on the omap platforms)."

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: twl4030_wdt: add DT support
  watchdog: omap_wdt: eliminate unused variable and a compiler warning
  watchdog: da9055: Don't update wdt_dev->timeout in da9055_wdt_set_timeout error path
  watchdog: da9055: Fix invalid free of devm_ allocated data
---

ef05e9b9602660fd468e05f5fbe8f08ad7418b73