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

Pull watchdog updates from Wim Van Sebroeck:

 - new drivers for: NI 903x/913x watchdog driver, WinSystems EBC-C384
   watchdog timer and ARM SBSA watchdog driver

 - Support for NCT6102D devices

 - Improvements of the generic watchdog framework (improve restart
   handler, make set_timeout optional, introduce infrastructure
   triggered keepalives, ...

 - improvements on the pnx4008 watchdog driver

 - several smaller fixes and improvements

* git://www.linux-watchdog.org/linux-watchdog: (28 commits)
  watchdog: Ensure that wdd is not dereferenced if NULL
  watchdog: imx2: Convert to use infrastructure triggered keepalives
  watchdog: dw_wdt: Convert to use watchdog infrastructure
  watchdog: Add support for minimum time between heartbeats
  watchdog: Make stop function optional
  watchdog: Introduce WDOG_HW_RUNNING flag
  watchdog: Introduce hardware maximum heartbeat in watchdog core
  watchdog: Make set_timeout function optional
  arm: lpc32xx: remove restart handler
  arm: lpc32xx: phy3250 remove restart hook
  watchdog: pnx4008: restart: support "cmd" from userspace
  watchdog: pnx4008: add support for soft reset
  watchdog: pnx4008: add restart handler
  watchdog: pnx4008: update logging during power-on
  watchdog: tangox_wdt: test clock rate to avoid division by 0
  watchdog: atlas7_wdt: test clock rate to avoid division by 0
  watchdog: s3c2410_wdt: Add max and min timeout values
  Watchdog: introduce ARM SBSA watchdog driver
  Documentation: add sbsa-gwdt driver documentation
  watchdog: Add watchdog timer support for the WinSystems EBC-C384
  ...

diff --cc Documentation/watchdog/watchdog-parameters.txt
Simple merge

diff --cc MAINTAINERS
index 0cbfc69,88b769a..606528b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11965,12 -11870,12 +11965,18 @@@ M:        David Härdeman <david@hardeman.nu
  S:    Maintained
  F:    drivers/media/rc/winbond-cir.c
  
+ WINSYSTEMS EBC-C384 WATCHDOG DRIVER
+ M:    William Breathitt Gray <vilhelm.gray@gmail.com>
+ L:    linux-watchdog@vger.kernel.org
+ S:    Maintained
+ F:    drivers/watchdog/ebc-c384_wdt.c
+ 
 +WINSYSTEMS WS16C48 GPIO DRIVER
 +M:    William Breathitt Gray <vilhelm.gray@gmail.com>
 +L:    linux-gpio@vger.kernel.org
 +S:    Maintained
 +F:    drivers/gpio/gpio-ws16c48.c
 +
  WIMAX STACK
  M:    Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
  M:    linux-wimax@intel.com

diff --cc arch/arm/mach-lpc32xx/phy3250.c
Simple merge

diff --cc drivers/watchdog/Kconfig
index 9289da3,302078e..fb94765
--- 1/drivers/watchdog/Kconfig
--- 2/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@@ -1214,21 -1247,17 +1247,32 @@@ config SBC_EPX_C3_WATCHDO
          To compile this driver as a module, choose M here: the
          module will be called sbc_epx_c3.
  
 +config INTEL_MEI_WDT
 +      tristate "Intel MEI iAMT Watchdog"
 +      depends on INTEL_MEI && X86
 +      select WATCHDOG_CORE
 +      ---help---
 +        A device driver for the Intel MEI iAMT watchdog.
 +
 +        The Intel AMT Watchdog is an OS Health (Hang/Crash) watchdog.
 +        Whenever the OS hangs or crashes, iAMT will send an event
 +        to any subscriber to this event. The watchdog doesn't reset the
 +        the platform.
 +
 +        To compile this driver as a module, choose M here:
 +        the module will be called mei_wdt.
 +
+ config NI903X_WDT
+       tristate "NI 903x/913x Watchdog"
+       depends on X86 && ACPI
+       select WATCHDOG_CORE
+       ---help---
+         This is the driver for the watchdog timer on the National Instruments
+         903x/913x real-time controllers.
+ 
+         To compile this driver as a module, choose M here: the module will be
+         called ni903x_wdt.
+ 
  # M32R Architecture
  
  # M68K Architecture

diff --cc drivers/watchdog/Makefile
index 14bd772,9ae5db0..feb6270
--- 1/drivers/watchdog/Makefile
--- 2/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@@ -126,7 -128,7 +128,8 @@@ obj-$(CONFIG_MACHZ_WDT) += machzwd.
  obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
  obj-$(CONFIG_INTEL_SCU_WATCHDOG) += intel_scu_watchdog.o
  obj-$(CONFIG_INTEL_MID_WATCHDOG) += intel-mid_wdt.o
 +obj-$(CONFIG_INTEL_MEI_WDT) += mei_wdt.o
+ obj-$(CONFIG_NI903X_WDT) += ni903x_wdt.o
  
  # M32R Architecture