From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Aug 2014 03:54:47 +0000 (-0700)
Subject: Merge git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: v3.17-rc1~98
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a1b0a006ea7eb0c272cef33740a9563cd5190974;p=linux.git

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

Pull watchdog updates from Wim Van Sebroeck:
 - remove unnecessary checks after platform_get_resource()
 - fix watchdog api documentation typo's
 - imx2_wdt: adds big endianness support
 - move restart code to the sunxi watchdog driver

* git://www.linux-watchdog.org/linux-watchdog:
  wdt: sunxi: Move restart code to the watchdog driver
  Documentation: fix two typos in watchdog-api.txt
  watchdog: imx2_wdt: adds big endianness support.
  watchdog: shwdt: Remove the unnecessary check of resource after platform_get_resource()
  watchdog: lantiq_wdt: Remove the un-necessary check of resource after platform_get_resource()
  watchdog: dw_wdt: Remove the un-necessary check after platform_get_resource()
---

a1b0a006ea7eb0c272cef33740a9563cd5190974