diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2019-06-22 11:16:25 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2019-06-22 11:16:25 +0200 |
commit | 48c7d73b2362ce61503551ad70052617b3e8857d (patch) | |
tree | 6b5ca29fb7964d29128a8d476317c27a61462e52 /arch/arm/mach-cns3xxx/pm.h | |
parent | 88447c5b93d98be847f428c39ba589779a59eb83 (diff) | |
parent | 975a6166a8584ee4a1b8bd93098e49dc101d7171 (diff) |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent
Pull another handful of EFI fixes for v5.2 from Arnd:
- Fix a potential crash after kexec on arm64 with GICv3
- Fix a build warning on x86
- Stop policing the BGRT feature flags
- Use a non-blocking version of SetVariable() in the boot control driver
Diffstat (limited to 'arch/arm/mach-cns3xxx/pm.h')
-rw-r--r-- | arch/arm/mach-cns3xxx/pm.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-cns3xxx/pm.h b/arch/arm/mach-cns3xxx/pm.h index c2588cc991d1..61b73e59f0ff 100644 --- a/arch/arm/mach-cns3xxx/pm.h +++ b/arch/arm/mach-cns3xxx/pm.h @@ -1,11 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright 2000 Deep Blue Solutions Ltd * Copyright 2004 ARM Limited * Copyright 2008 Cavium Networks - * - * This file 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 __CNS3XXX_PM_H |