diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 13:53:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 13:53:20 +0200 |
| commit | 888dc273ea4e7ca332a6f73d10dfc8f2b212c803 (patch) | |
| tree | 0c2154dfa92ca6ee761c358e58a3e35831558bb5 /drivers/clk/st | |
| parent | tty: cpm_uart: drop unused iflag macro (diff) | |
| parent | Linux 5.2-rc3 (diff) | |
| download | linux-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.tar.xz linux-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.zip | |
Merge 5.2-rc3 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clk/st')
| -rw-r--r-- | drivers/clk/st/Makefile | 1 | ||||
| -rw-r--r-- | drivers/clk/st/clk-flexgen.c | 3 | ||||
| -rw-r--r-- | drivers/clk/st/clkgen-mux.c | 7 | ||||
| -rw-r--r-- | drivers/clk/st/clkgen-pll.c | 7 |
4 files changed, 5 insertions, 13 deletions
diff --git a/drivers/clk/st/Makefile b/drivers/clk/st/Makefile index ede7b2f13092..caf77893761e 100644 --- a/drivers/clk/st/Makefile +++ b/drivers/clk/st/Makefile @@ -1 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-y += clkgen-mux.o clkgen-pll.o clkgen-fsyn.o clk-flexgen.o diff --git a/drivers/clk/st/clk-flexgen.c b/drivers/clk/st/clk-flexgen.c index ca8d5350f94e..d18e49b4976f 100644 --- a/drivers/clk/st/clk-flexgen.c +++ b/drivers/clk/st/clk-flexgen.c @@ -1,9 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * clk-flexgen.c * * Copyright (C) ST-Microelectronics SA 2013 * Author: Maxime Coquelin <maxime.coquelin@st.com> for ST-Microelectronics. - * License terms: GNU General Public License (GPL), version 2 */ + */ #include <linux/clk.h> #include <linux/clk-provider.h> diff --git a/drivers/clk/st/clkgen-mux.c b/drivers/clk/st/clkgen-mux.c index 23497f07ad89..ce583ded968a 100644 --- a/drivers/clk/st/clkgen-mux.c +++ b/drivers/clk/st/clkgen-mux.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * clkgen-mux.c: ST GEN-MUX Clock driver * @@ -5,12 +6,6 @@ * * Authors: Stephen Gallimore <stephen.gallimore@st.com> * Pankaj Dev <pankaj.dev@st.com> - * - * 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. - * */ #include <linux/slab.h> diff --git a/drivers/clk/st/clkgen-pll.c b/drivers/clk/st/clkgen-pll.c index 6930348ce843..d8a688bd45ec 100644 --- a/drivers/clk/st/clkgen-pll.c +++ b/drivers/clk/st/clkgen-pll.c @@ -1,11 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 STMicroelectronics (R&D) Limited - * - * 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. - * */ /* |