Merge branch 'x86/cpu' into x86/asm, to avoid conflict
[cascardo/linux.git] / arch / arm64 / boot / dts / socionext / uniphier-support-card.dtsi
1 ../../../../arm/boot/dts/uniphier-support-card.dtsi