From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 13 Oct 2013 18:41:26 +0000 (-0700)
Subject: Merge git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: MMI-PSA29.97-13-9~13460
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=73cac03d0c771e56481017b8f093ae0300e89dad;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

Pull watchdog fixes from Wim Van Sebroeck:
 "This will fix a deadlock on the ts72xx_wdt driver, fix bitmasks in the
  kempld_wdt driver and fix a section mismatch in the sunxi_wdt driver"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: sunxi: Fix section mismatch
  watchdog: kempld_wdt: Fix bit mask definition
  watchdog: ts72xx_wdt: locking bug in ioctl
---

73cac03d0c771e56481017b8f093ae0300e89dad