Module Name: src
Committed By: skrll
Date: Fri Jan 3 15:04:34 UTC 2020
Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: bcm2835-common.dtsi
bcm2835-rpi.dtsi bcm283x.dtsi sun8i-a23-ippo-q8h-v1.2.dts
sun8i-a23-ippo-q8h-v5.dts sun8i-a33-et-q8-v1.6.dts
sun8i-a33-ippo-q8h-v1.2.dts
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner:
sun50i-h5-nanopi-neo-plus2.dts sun50i-h6-pine-h64.dts
sun50i-h6.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic:
meson-gx.dtsi meson-gxbb.dtsi meson-gxl.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm:
vexpress-v2m-rs1.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip:
rk3328-rock64.dts
src/sys/external/gpl2/dts/dist/include/dt-bindings/input:
linux-event-codes.h
src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl:
stm32-pinfunc.h
Removed Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: at91-kizbox2.dts
imx6ul-phytec-pcl063.dtsi imx6ul-phytec-peb-eval-01.dtsi
imx6ul-phytec-phyboard-segin-full.dts
imx6ul-phytec-phyboard-segin.dtsi rk3288-fennec.dts
src/sys/external/gpl2/dts/dist/include/dt-bindings/clock:
xlnx,zynqmp-clk.h
Log Message:
Merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/at91-kizbox2.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/rk3288-fennec.dts
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-common.dtsi
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6ul-phytec-pcl063.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6ul-phytec-peb-eval-01.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6ul-phytec-phyboard-segin-full.dts
\
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6ul-phytec-phyboard-segin.dtsi
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gx.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/clock/xlnx,zynqmp-clk.h
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
