diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-05-05 10:01:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-05-05 10:01:34 +0200 |
| commit | 12e2c41148a9e68bc3b261954961db9d28decf47 (patch) | |
| tree | 6b52bbd4b222f3995090320b08a54fece5a12d48 /arch/x86/kernel/jailhouse.c | |
| parent | c427f69564e2a844c5fcf2804042609342513da0 (diff) | |
| parent | 1504269814263c9676b4605a6a91e14dc6ceac21 (diff) | |
| download | linux-12e2c41148a9e68bc3b261954961db9d28decf47.tar.gz | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/jailhouse.c')
| -rw-r--r-- | arch/x86/kernel/jailhouse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/jailhouse.c b/arch/x86/kernel/jailhouse.c index fa183a131edc..a15fe0e92cf9 100644 --- a/arch/x86/kernel/jailhouse.c +++ b/arch/x86/kernel/jailhouse.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL2.0 +// SPDX-License-Identifier: GPL-2.0 /* * Jailhouse paravirt_ops implementation * |