]> git.baikalelectronics.ru Git - kernel.git/commit
Merge mainline/master into arm/fixes
authorOlof Johansson <olof@lixom.net>
Thu, 5 Dec 2019 21:16:58 +0000 (13:16 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 5 Dec 2019 21:18:54 +0000 (13:18 -0800)
commite29a1504807bb2f38dece08b85fc2a3bdb237dcc
tree75ec655b440fbc1c454247af38b5596dd8c78de9
parentbb61b739be3c89fea723235db2f99fe7abf34bd8
parentd52a89db61ab035d633371ba7f7e294009491157
Merge mainline/master into arm/fixes

This brings in the mainline tree right after armsoc contents was merged
this release cycle, so that we can re-run savedefconfig, etc.

Signed-off-by: Olof Johansson <olof@lixom.net>
.mailmap
MAINTAINERS
arch/arm/mach-pxa/icontrol.c