summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-30 20:13:55 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-30 20:13:55 +0300
commitdd36d7393d6310b0c1adefb22fba79c3cf8a577c (patch)
treeaedf3c14c57f3663dbe476155d24a0471f9b5f0f /arch
parentd4e842be2b697eb61c8863fe4b080bf0688198a2 (diff)
parent3cef072d3bbd4344823545e50d8cb240a6d4635d (diff)
downloadlinux-dd36d7393d6310b0c1adefb22fba79c3cf8a577c.tar.xz
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
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions