diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-11-15 10:30:50 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-11-15 10:30:50 +0100 |
| commit | ac94be498f84f7327533b62faca4c3da64434904 (patch) | |
| tree | 63893f37afb67cd400bf60ec16a35440d16f2a90 /arch/um/include/shared/kern_util.h | |
| parent | dce7cd62754b5d4a6e401b8b0769ec94cf971041 (diff) | |
| parent | 8c5bd25bf42effd194d4b0b43895c42b374e620b (diff) | |
Merge branch 'linus' into x86/hyperv
Pick up upstream fixes to avoid conflicts.
Diffstat (limited to 'arch/um/include/shared/kern_util.h')
| -rw-r--r-- | arch/um/include/shared/kern_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/shared/kern_util.h b/arch/um/include/shared/kern_util.h index 35ab97e4bb9b..ccafb62e8cce 100644 --- a/arch/um/include/shared/kern_util.h +++ b/arch/um/include/shared/kern_util.h @@ -1,6 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) - * Licensed under the GPL */ #ifndef __KERN_UTIL_H__ |