]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 62a295b 35ba267)
Merge tag 'davinci-for-v4.17/defconfig' of ssh://gitolite.kernel.org/pub/scm/linux...
authorArnd Bergmann <arnd@arndb.de>
Wed, 7 Mar 2018 15:03:13 +0000 (16:03 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 7 Mar 2018 15:03:13 +0000 (16:03 +0100)
Pull "DaVinci defconfig updates for v4.17" from Sekhar Nori:

Enable SYSCON_REBOOT_MODE needed for Lego EV3 and build the DaVinci
watchdog driver in so reboot works even when modules are not loaded.

* tag 'davinci-for-v4.17/defconfig' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci_all_defconfig: set CONFIG_DAVINCI_WATCHDOG=y
  ARM: davinci_all_defconfig: enable SYSCON_REBOOT_MODE


Trivial merge
local clone of linux.git