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/hisilicon/reset.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/hisilicon/reset.c')
| -rw-r--r-- | drivers/clk/hisilicon/reset.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/clk/hisilicon/reset.c b/drivers/clk/hisilicon/reset.c index 43e82fa64422..2e22fea2a2e7 100644 --- a/drivers/clk/hisilicon/reset.c +++ b/drivers/clk/hisilicon/reset.c @@ -1,20 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hisilicon Reset Controller Driver * * Copyright (c) 2015-2016 HiSilicon Technologies Co., Ltd. - * - * 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. - * - * This program is distributed in the hope that 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/io.h> |