Module Name: src
Committed By: jmcneill
Date: Sat Oct 28 10:35:04 UTC 2017
Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext:
uniphier-pinctrl.dtsi uniphier-ref-daughter.dtsi
uniphier-support-card.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: imx6ul-geam-kit.dts
imx6ul-geam.dtsi imx6ul-isiot-common.dtsi mt7623-evb.dts
rk1108-evb.dts rk1108.dtsi tegra20-whistler.dts
uniphier-sld3-ref.dts uniphier-sld3.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom:
bcm2835-rpi.dtsi bcm2837.dtsi bcm283x-rpi-smsc9514.dtsi
bcm283x-rpi-usb-host.dtsi bcm283x.dtsi ns2-clock.dtsi ns2-svk.dts
ns2-xmc.dts ns2.dtsi
src/sys/external/gpl2/dts/dist/include/dt-bindings/genpd: k2g.h
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6ul-geam-kit.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6ul-isiot-common.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/mt7623-evb.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/rk1108-evb.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/tegra20-whistler.dts
cvs rdiff -u -r1.1.1.2 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6ul-geam.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/rk1108.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/uniphier-sld3-ref.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/uniphier-sld3.dtsi
cvs rdiff -u -r1.3 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm283x.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/bcm2837.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/ns2-clock.dtsi
cvs rdiff -u -r1.1.1.2 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/ns2-svk.dts \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/ns2-xmc.dts \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/broadcom/ns2.dtsi
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/genpd/k2g.h
cvs rdiff -u -r1.3 -r1.4 \
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.
