Module Name: src
Committed By: jmcneill
Date: Thu Nov 30 19:42:59 UTC 2017
Modified Files:
src/sys/external/gpl2/dts/dist/include/dt-bindings/input:
linux-event-codes.h
Removed Files:
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts: .gitignore
src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl:
stm32f429-pinfunc.h stm32f746-pinfunc.h stm32h7-pinfunc.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/arm64/boot/dts/.gitignore
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32f429-pinfunc.h \
src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32f746-pinfunc.h \
src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32h7-pinfunc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
