diff options
| author | Maarten Lankhorst | 2019-06-19 12:32:13 +0200 |
|---|---|---|
| committer | Maarten Lankhorst | 2019-06-19 12:32:13 +0200 |
| commit | bcb7416e3480c1abb46266bdab874b3b3d6124cb (patch) | |
| tree | 9d889b14957c0e266697d0674675bc42b0899571 /include/linux/mfd/abx500/ux500_chargalg.h | |
| parent | drm/vc4: hdmi: Set default state margin at reset (diff) | |
| parent | Merge v5.2-rc5 into drm-next (diff) | |
| download | kernel-qcow2-linux-bcb7416e3480c1abb46266bdab874b3b3d6124cb.tar.gz kernel-qcow2-linux-bcb7416e3480c1abb46266bdab874b3b3d6124cb.tar.xz kernel-qcow2-linux-bcb7416e3480c1abb46266bdab874b3b3d6124cb.zip | |
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
remove-fbcon-notifiers topic branch is based on rc4, so we need a fresh
backmerge of drm-next to pull it in.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'include/linux/mfd/abx500/ux500_chargalg.h')
| -rw-r--r-- | include/linux/mfd/abx500/ux500_chargalg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/abx500/ux500_chargalg.h b/include/linux/mfd/abx500/ux500_chargalg.h index 669894f434f5..9b97d284d0ce 100644 --- a/include/linux/mfd/abx500/ux500_chargalg.h +++ b/include/linux/mfd/abx500/ux500_chargalg.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson SA 2012 * Author: Johan Gardsmark <johan.gardsmark@stericsson.com> for ST-Ericsson. - * License terms: GNU General Public License (GPL), version 2 */ #ifndef _UX500_CHARGALG_H |