diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-07-15 18:42:32 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-07-15 18:42:32 +0200 |
commit | ecb41832bd2a7a3f8ac93527cec5e51e3827daed (patch) | |
tree | a382a3719eca9ac8a22ae7f1715d0bd4843dc8e2 /include/dt-bindings/clock/r8a73a4-clock.h | |
parent | Input: synaptics - fix misuse of strlcpy (diff) | |
parent | Linux 5.2 (diff) | |
download | linux-ecb41832bd2a7a3f8ac93527cec5e51e3827daed.tar.xz linux-ecb41832bd2a7a3f8ac93527cec5e51e3827daed.zip |
Merge tag 'v5.2' into next
Sync up with mainline to resolve conflicts in iforce driver.
Diffstat (limited to 'include/dt-bindings/clock/r8a73a4-clock.h')
-rw-r--r-- | include/dt-bindings/clock/r8a73a4-clock.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/dt-bindings/clock/r8a73a4-clock.h b/include/dt-bindings/clock/r8a73a4-clock.h index 4b3668157257..1ec4827b8091 100644 --- a/include/dt-bindings/clock/r8a73a4-clock.h +++ b/include/dt-bindings/clock/r8a73a4-clock.h @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Ulrich Hecht - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #ifndef __DT_BINDINGS_CLOCK_R8A73A4_H__ |