summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-01-24 14:47:24 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-01-24 14:47:24 -0800
commitf828d5e2487d57699c1b9143619d03f71b164cda (patch)
treeaf1fa721109ad2af38b70c2b70bbf871d9561382 /init
parent0012125adee58a3865da7701583b7b1aee3b4ba8 (diff)
parent7a32757eda68a53626f003018733d09f94138334 (diff)
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.
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions