]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe3eae3 9fa021a)
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)
# Conflicts:
# arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
# arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.