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)
commit942e6f8a8314e5550e254519dfba4ccd5170421d
tree75ec655b440fbc1c454247af38b5596dd8c78de9
parent336bab731be76a90291697e51d2aed0ad67d7cb5
parentb08baef02b26cf7c2123e4a24a2fa1fb7a593ffb
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