Module Name: src
Committed By: jmcneill
Date: Tue Jan 22 15:13:23 UTC 2019
Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: bcm283x.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner:
sun50i-h6-pine-h64.dts sun50i-h6.dtsi
src/sys/external/gpl2/dts/dist/include/dt-bindings/input:
linux-event-codes.h
Removed Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts:
exynos4412-tmu-sensor-conf.dtsi exynos5420-tmu-sensor-conf.dtsi
mt7623n-rfb-nand.dts mt7623n-rfb.dtsi
socfpga_cyclone5_de0_sockit.dts tegra20-colibri-512.dtsi
tegra20-iris-512.dts
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/exynos:
exynos5433-tmu-g3d-sensor-conf.dtsi exynos5433-tmu-sensor-conf.dtsi
exynos7-tmu-sensor-conf.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/xilinx:
zynqmp-ep108-clk.dtsi zynqmp-ep108.dts
src/sys/external/gpl2/dts/dist/include/dt-bindings/clock: exynos5440.h
Log Message:
Merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
cvs rdiff -u -r1.1.1.2 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/mt7623n-rfb.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/tegra20-iris-512.dts
cvs rdiff -u -r1.1.1.3 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/mt7623n-rfb-nand.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts
\
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/tegra20-colibri-512.dtsi
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
cvs rdiff -u -r1.1.1.2 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi
cvs rdiff -u -r1.1.1.3 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/clock/exynos5440.h
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
