projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 336bab7 b08baef)
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)
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>
1  2 
.mailmap patch | diff1 | diff2 | blob | history
MAINTAINERS patch | diff1 | diff2 | blob | history
arch/arm/mach-pxa/icontrol.c patch | diff1 | diff2 | blob | history

diff --cc .mailmap
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mach-pxa/icontrol.c
Simple merge
John Crispins staging tree