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/pinctrl/machine.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/pinctrl/machine.h')
-rw-r--r-- | include/linux/pinctrl/machine.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/pinctrl/machine.h b/include/linux/pinctrl/machine.h index 7fa5d87190c2..ddd1b2773431 100644 --- a/include/linux/pinctrl/machine.h +++ b/include/linux/pinctrl/machine.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Machine interface for the pinctrl subsystem. * @@ -6,8 +7,6 @@ * Based on bits of regulator core, gpio core and clk core * * Author: Linus Walleij <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef __LINUX_PINCTRL_MACHINE_H #define __LINUX_PINCTRL_MACHINE_H |