diff options
| author | Ingo Molnar | 2017-11-07 10:32:44 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2017-11-07 10:32:44 +0100 |
| commit | 8c5db92a705d9e2c986adec475980d1120fa07b4 (patch) | |
| tree | 9f0eea56889819707c0a1a8eb5b1fb2db3cdaf3d /drivers/power | |
| parent | x86/paravirt: Set up the virt_spin_lock_key after static keys get initialized (diff) | |
| parent | Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | kernel-qcow2-linux-8c5db92a705d9e2c986adec475980d1120fa07b4.tar.gz kernel-qcow2-linux-8c5db92a705d9e2c986adec475980d1120fa07b4.tar.xz kernel-qcow2-linux-8c5db92a705d9e2c986adec475980d1120fa07b4.zip | |
Merge branch 'linus' into locking/core, to resolve conflicts
Conflicts:
include/linux/compiler-clang.h
include/linux/compiler-gcc.h
include/linux/compiler-intel.h
include/uapi/linux/stddef.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/reset/Makefile | 1 | ||||
| -rw-r--r-- | drivers/power/reset/gemini-poweroff.c | 1 | ||||
| -rw-r--r-- | drivers/power/reset/piix4-poweroff.c | 4 | ||||
| -rw-r--r-- | drivers/power/supply/Makefile | 1 | ||||
| -rw-r--r-- | drivers/power/supply/ab8500_bmdata.c | 1 |
5 files changed, 6 insertions, 2 deletions
diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile index 58cf5b30559f..aeb65edb17b7 100644 --- a/drivers/power/reset/Makefile +++ b/drivers/power/reset/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_POWER_RESET_AS3722) += as3722-poweroff.o obj-$(CONFIG_POWER_RESET_AT91_POWEROFF) += at91-poweroff.o obj-$(CONFIG_POWER_RESET_AT91_RESET) += at91-reset.o diff --git a/drivers/power/reset/gemini-poweroff.c b/drivers/power/reset/gemini-poweroff.c index de878fd26f27..ff75af5abbc5 100644 --- a/drivers/power/reset/gemini-poweroff.c +++ b/drivers/power/reset/gemini-poweroff.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Gemini power management controller * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org> diff --git a/drivers/power/reset/piix4-poweroff.c b/drivers/power/reset/piix4-poweroff.c index bacfc95783f0..20ce3ff5e039 100644 --- a/drivers/power/reset/piix4-poweroff.c +++ b/drivers/power/reset/piix4-poweroff.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2016 Imagination Technologies - * Author: Paul Burton <paul.burton@imgtec.com> + * Author: Paul Burton <paul.burton@mips.com> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -109,5 +109,5 @@ static struct pci_driver piix4_poweroff_driver = { }; module_pci_driver(piix4_poweroff_driver); -MODULE_AUTHOR("Paul Burton <paul.burton@imgtec.com>"); +MODULE_AUTHOR("Paul Burton <paul.burton@mips.com>"); MODULE_LICENSE("GPL"); diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile index 621a19058fec..aae4e4a8bbb3 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 subdir-ccflags-$(CONFIG_POWER_SUPPLY_DEBUG) := -DDEBUG power_supply-y := power_supply_core.o diff --git a/drivers/power/supply/ab8500_bmdata.c b/drivers/power/supply/ab8500_bmdata.c index 8c49586015d0..4a7ed50d1dc5 100644 --- a/drivers/power/supply/ab8500_bmdata.c +++ b/drivers/power/supply/ab8500_bmdata.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/export.h> #include <linux/power_supply.h> #include <linux/of.h> |