diff options
author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2019-07-29 18:51:48 +0300 |
---|---|---|
committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2019-07-29 18:51:48 +0300 |
commit | ed32f8d42cee118b075e4372a55c7739a11094b2 (patch) | |
tree | 5a806c5168d4177e0536b98b6bda30ec4bdbac43 /arch/arm/include/asm/thread_info.h | |
parent | 60a4233a4952729089e4df152e730f8f4d0e82ce (diff) | |
parent | 5f9e832c137075045d15cd6899ab0505cfb2ca4b (diff) | |
download | linux-ed32f8d42cee118b075e4372a55c7739a11094b2.tar.xz |
Merge drm/drm-next into drm-intel-next-queued
Catching up with 5.3-rc*
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'arch/arm/include/asm/thread_info.h')
-rw-r--r-- | arch/arm/include/asm/thread_info.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h index 286eb61c632b..0d0d5178e2c3 100644 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm/thread_info.h @@ -1,11 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * arch/arm/include/asm/thread_info.h * * Copyright (C) 2002 Russell King. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #ifndef __ASM_ARM_THREAD_INFO_H #define __ASM_ARM_THREAD_INFO_H |