]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'sunxi/sunxi/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 23:08:00 +0000 (09:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 23:08:00 +0000 (09:08 +1000)
commitc59294bc24bb4e9ee1c0c0dac3be62083b5db4ba
tree64021517cea209e59af3066c0674bb1b8a0e8c0b
parentfe3eae3f36adef3fa75bb64fdb58fc409592424e
parent9fa021aa01fdc9576f4b523543210017af22fbb8
Merge remote-tracking branch 'sunxi/sunxi/for-next'

# Conflicts:
# arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
# arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts