]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
projects / thirdparty / kernel / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bc90f56 8e99e77)
Merge branch 'arm64-fixes-for-6.10' into arm64-for-6.11
authorBjorn Andersson <andersson@kernel.org>
Thu, 6 Jun 2024 22:38:08 +0000 (17:38 -0500)
committerBjorn Andersson <andersson@kernel.org>
Thu, 6 Jun 2024 22:38:08 +0000 (17:38 -0500)
commit80edfc18de69508e37b6668d668194a3e9556f5e
tree3be0111f4f813f87c565238496d2a4cfd1867e16tree | snapshot
parentbc90f56a169987975072efa56c3b595eda19668acommit | diff
parent8e99e770f7eab8f8127098df7824373c4b4e8b5ccommit | diff
Merge branch 'arm64-fixes-for-6.10' into arm64-for-6.11

Merge the arm64-fixes-for-6.10 branch into arm64-for-6.11 to resolve the
merge conflict caused by pmic-glink and reserved-memory introduction at
the same place in the x1e80100 crd and qcp dts files.
arch/arm64/boot/dts/qcom/sa8775p.dtsi diff1 | diff2 | blob | history
arch/arm64/boot/dts/qcom/sc8180x.dtsi diff1 | diff2 | blob | history
arch/arm64/boot/dts/qcom/sc8280xp.dtsi diff1 | diff2 | blob | history
arch/arm64/boot/dts/qcom/x1e80100-crd.dts diff1 | diff2 | blob | history
arch/arm64/boot/dts/qcom/x1e80100-qcp.dts diff1 | diff2 | blob | history
arch/arm64/boot/dts/qcom/x1e80100.dtsi diff1 | diff2 | blob | history
A mirror of Linus' kernel repository