diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:12:27 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:12:27 +0200 |
commit | 23da766ab1dc005860b675bf048226a11a748bf9 (patch) | |
tree | 3f8dbfc2cf68f5da3faa3a377087b06dd8ad343d /drivers/media/platform/rockchip/rga/rga.c | |
parent | sched/fair: Remove sgs->sum_weighted_load (diff) | |
parent | Linux 5.2-rc5 (diff) | |
download | linux-dev-23da766ab1dc005860b675bf048226a11a748bf9.tar.xz linux-dev-23da766ab1dc005860b675bf048226a11a748bf9.zip |
Merge tag 'v5.2-rc5' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/platform/rockchip/rga/rga.c')
-rw-r--r-- | drivers/media/platform/rockchip/rga/rga.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c index b096227a9722..5283d4533fa0 100644 --- a/drivers/media/platform/rockchip/rga/rga.c +++ b/drivers/media/platform/rockchip/rga/rga.c @@ -1,15 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd * Author: Jacob Chen <jacob-chen@iotwrt.com> - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * 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. */ #include <linux/clk.h> |