| commit | a03cb92688346145a51229f3467fe208c0ad6d9e | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Tue Oct 01 12:24:21 2024 -0600 |
| committer | Tom Rini <trini@konsulko.com> | Tue Oct 01 12:24:21 2024 -0600 |
| tree | 3ab71746d990f8ffd004c8d874fe5f823e5c7f26 | |
| parent | a3d6939ca80e6628505268a9753ad42e50529efb [diff] [blame] | |
| parent | 6b642aca7f571e777924f50732f530fd94b03bfb [diff] [blame] |
Subtree merge tag 'v6.11-dts' of dts repo [1] into dts/upstream [1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git
diff --git a/dts/upstream/include/dt-bindings/mfd/st,stpmic1.h b/dts/upstream/include/dt-bindings/mfd/st,stpmic1.h index 321cd08..9dd15b9 100644 --- a/dts/upstream/include/dt-bindings/mfd/st,stpmic1.h +++ b/dts/upstream/include/dt-bindings/mfd/st,stpmic1.h
@@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */ /* * Copyright (C) STMicroelectronics 2018 - All Rights Reserved * Author: Philippe Peurichard <philippe.peurichard@st.com>,