]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'char-misc/char-misc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 06:54:52 +0000 (16:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 06:54:52 +0000 (16:54 +1000)
commit073366356abae059e945938ecfaf069f824aea5f
tree9aa66ae3d3321bfcd75155bb1129f8193e2b604b
parentb6806f7e503d9eee1998f1ddf983c1c80ff1b16f
parent31d8df9f4ae540bee25ca963a8c8b6847867a3d0
Merge remote-tracking branch 'char-misc/char-misc-next'

# Conflicts:
# drivers/phy/qualcomm/phy-qcom-qmp.c
Documentation/devicetree/bindings/nvmem/mtk-efuse.txt
Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml
MAINTAINERS
drivers/android/binder.c
drivers/extcon/extcon-qcom-spmi-misc.c
drivers/firmware/Kconfig
drivers/fpga/Kconfig
drivers/hwtracing/coresight/coresight-core.c
drivers/hwtracing/coresight/coresight-etm-perf.c
drivers/hwtracing/coresight/coresight-etm4x-core.c
drivers/misc/uacce/uacce.c