projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5e0af24 dace8bb)
Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Dec 2013 19:30:10 +0000 (11:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Dec 2013 19:30:10 +0000 (11:30 -0800)
commit9538e10086bd1301fe915683b1ba0a1de66d7483
tree5fe464dca440c75843b04cbad1ee703ca82a96e9tree | snapshot (tar.gz zip)
parent5e0af24cee56e75d0cb13dc072539acb52f694cfcommit | diff
parentdace8bbfccfd9e4fcccfffcfbd82881fda3e756fcommit | diff
Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:
 "Drop the unnecessary miscdevice.h includes that we forgot in commit
  487722cf2d66 ("watchdog: Get rid of MODULE_ALIAS_MISCDEV statements")
  and fix an oops for the sc1200_wdt driver"

* git://www.linux-watchdog.org/linux-watchdog:
  sc1200_wdt: Fix oops
  watchdog: Drop unnecessary include of miscdevice.h