]> 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)
commit991c60cbe45b7934b93df8e2538c63b734c3faa9
tree75ec655b440fbc1c454247af38b5596dd8c78de9
parent9293759e01a728dc2c87d2d45e191021e511fe98
parentfcff1d8d8d619dfbb998ca1e586bf80c9044c42d
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