Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Jan 2015 22:47:24 +0000 (14:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Jan 2015 22:47:24 +0000 (14:47 -0800)
commitf828d5e2487d57699c1b9143619d03f71b164cda
treeaf1fa721109ad2af38b70c2b70bbf871d9561382
parent0012125adee58a3865da7701583b7b1aee3b4ba8
parent7a32757eda68a53626f003018733d09f94138334
Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:
 "This will fix reboot issues with the imx2_wdt driver and it also drops
  some forgotten owner assignments from platform_drivers"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: drop owner assignment from platform_drivers
  watchdog: imx2_wdt: Disable power down counter on boot
  watchdog: imx2_wdt: Improve power management support.