projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 03a6c25 a17f4f0)
Merge tag 'linux-watchdog-4.16-fixes-1' of git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Mar 2018 17:59:51 +0000 (09:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Mar 2018 17:59:51 +0000 (09:59 -0800)
commitd6d0972ae7e4306065e490a4b476042bd80f8b27
tree91ac8ccc3cbf0895f5299d34bf2de178ce9c004ctree | snapshot
parent03a6c2592f0020a43d0eb7d08010f2fa23c46fe7commit | diff
parenta17f4f032b61abd998a1f81b206a4517e2e3db2fcommit | diff
Merge tag 'linux-watchdog-4.16-fixes-1' of git://linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:

 - rave-sp: add NVMEM dependency

 - build fixes for i6300esb_wdt, xen_wdt and sp5100_tco

* tag 'linux-watchdog-4.16-fixes-1' of git://www.linux-watchdog.org/linux-watchdog:
  watchdog: sp5100_tco.c: fix potential build failure
  watchdog: xen_wdt: fix potential build failure
  watchdog: i6300esb: fix build failure
  watchdog: rave-sp: add NVMEM dependency
John Crispins staging tree