diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 07:27:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 07:27:16 +0200 |
| commit | 23004ec330925e6834c8ddac00e3dd12eb5fb345 (patch) | |
| tree | 6bcbf18d8a2429e16f842b8a357f439f4f8d3926 /drivers/clk/tegra/clk-divider.c | |
| parent | staging: mt7621-dma: sizeof via pointer dereference (diff) | |
| parent | Linux 5.2-rc3 (diff) | |
| download | linux-23004ec330925e6834c8ddac00e3dd12eb5fb345.tar.xz linux-23004ec330925e6834c8ddac00e3dd12eb5fb345.zip | |
Merge 5.2-rc3 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clk/tegra/clk-divider.c')
| -rw-r--r-- | drivers/clk/tegra/clk-divider.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/clk/tegra/clk-divider.c b/drivers/clk/tegra/clk-divider.c index 2a1822a22740..e76731fb7d69 100644 --- a/drivers/clk/tegra/clk-divider.c +++ b/drivers/clk/tegra/clk-divider.c @@ -1,17 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <linux/kernel.h> |