Module Name: src Committed By: kre Date: Sun Jan 27 05:07:46 UTC 2019
Modified Files: src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl: stm32-pinfunc.h Log Message: Fix merge botch To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ 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.
Modified files: Index: src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h diff -u src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h:1.2 src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h:1.3 --- src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h:1.2 Sun Jan 27 02:08:43 2019 +++ src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h Sun Jan 27 05:07:46 2019 @@ -1,10 +1,4 @@ -/* $NetBSD: stm32-pinfunc.h,v 1.2 2019/01/27 02:08:43 pgoyette Exp $ */ - -/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ -/* - * Copyright (C) STMicroelectronics 2017 - All Rights Reserved - * Author: Torgue Alexandre <alexandre.tor...@st.com> for STMicroelectronics. - */ +/* $NetBSD: stm32-pinfunc.h,v 1.3 2019/01/27 05:07:46 kre Exp $ */ /* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ /*