]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Sep 2015 17:13:55 +0000 (13:13 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Sep 2015 17:13:55 +0000 (13:13 -0400)
commitdd36d7393d6310b0c1adefb22fba79c3cf8a577c
treeaedf3c14c57f3663dbe476155d24a0471f9b5f0f
parentd4e842be2b697eb61c8863fe4b080bf0688198a2
parent3cef072d3bbd4344823545e50d8cb240a6d4635d
Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:
 "This fixes:

   - module autoload for 3 OF platform drivers
   - poweroff behaviour on bcm2835 watchdog device
   - I2C dependencies for iTCO_wdt.c"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: iTCO: Fix dependencies on I2C
  watchdog: bcm2835: Fix poweroff behaviour
  watchdog: Fix module autoload for OF platform driver