tree e9c7dd3ab1f6a44728e4f95222b98bc22dee73a0
parent 3552570a21d46a98ba6885707235921f54b04d3e
parent 1d5898b4f8a0f6e231546d30dd54f6f9b89c232c
author Linus Torvalds <torvalds@linux-foundation.org> 1381689686 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1381689686 -0700

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