diff options
author | 2017-11-10 08:21:08 +0100 | |
---|---|---|
committer | 2017-11-10 08:21:08 +0100 | |
commit | b5cd3b51e247473e290be5cd09e77171e466cd89 (patch) | |
tree | ac8c87e1b38f61a4c879c574dc9373db41f3df01 /arch/x86/include/uapi/asm/boot.h | |
parent | x86/platform/UV: Convert timers to use timer_setup() (diff) | |
parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
download | wireguard-linux-b5cd3b51e247473e290be5cd09e77171e466cd89.tar.xz wireguard-linux-b5cd3b51e247473e290be5cd09e77171e466cd89.zip |
Merge branch 'linus' into x86/platform, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
-rw-r--r-- | arch/x86/include/uapi/asm/boot.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/uapi/asm/boot.h b/arch/x86/include/uapi/asm/boot.h index 94292c4c8122..88ffc5aee087 100644 --- a/arch/x86/include/uapi/asm/boot.h +++ b/arch/x86/include/uapi/asm/boot.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI_ASM_X86_BOOT_H #define _UAPI_ASM_X86_BOOT_H |