From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 29 Jan 2012 00:57:15 +0000 (-0800)
Subject: Merge git://www.linux-watchdog.org/linux-watchdog
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1c36ab1a318ab5b3b502e7e4fff3628d1a97861f;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

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

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: iTCO_wdt: add Intel Lynx Point DeviceIDs
  watchdog: via_wdt: Set min_timeout and max_timeout for wdt_dev
  watchdog: Fix typo "unexpectdly"
  watchdog: wafer5823wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options
  watchdog: wm8350_wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options
  watchdog: Return proper error in nuc900wdt_probe if misc_register fails
  watchdog: Staticise nuc900_wdt
  watchdog: via_wdt: Staticise wdt_pci_table
  watchdog: omap_wdt.c: Fix the mismatch of pm_runtime enable and disable
  watchdog: dw_wdt.c: use devm_request_and_ioremap
  watchdog: imx2_wdt.c: use devm_request_and_ioremap
---

1c36ab1a318ab5b3b502e7e4fff3628d1a97861f