diff options
author | Ingo Molnar <mingo@kernel.org> | 2022-09-02 11:31:58 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2022-09-02 11:33:33 +0300 |
commit | 1043897681808118c0f7e70b210774000fe06621 (patch) | |
tree | ec8c0aa114e8585a73b9a7afddf9e6a6f65e992e /arch/arm/mach-davinci/board-omapl138-hawk.c | |
parent | 652c5bf380ad018e15006a7f8349800245ddbbad (diff) | |
parent | 42e66b1cc3a070671001f8a1e933a80818a192bf (diff) | |
download | linux-1043897681808118c0f7e70b210774000fe06621.tar.xz |
Merge branch 'linus' into x86/mm, to refresh the branch
This branch is ~14k commits behind upstream, and has an old merge base
from early into the merge window, refresh it to v6.0-rc3+fixes before
queueing up new commits.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-davinci/board-omapl138-hawk.c')
-rw-r--r-- | arch/arm/mach-davinci/board-omapl138-hawk.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 20f71856bf7e..8a80115999ad 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Hawkboard.org based on TI's OMAP-L138 Platform * * Initial code: Syed Mohammed Khasim * * Copyright (C) 2009 Texas Instruments Incorporated - https://www.ti.com - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of - * any kind, whether express or implied. */ #include <linux/kernel.h> #include <linux/init.h> |