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/platform_data/mcs.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/platform_data/mcs.h')
| -rw-r--r-- | include/linux/platform_data/mcs.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/platform_data/mcs.h b/include/linux/platform_data/mcs.h index 61bb18a4fd3c..fcc6f2a1f5c3 100644 --- a/include/linux/platform_data/mcs.h +++ b/include/linux/platform_data/mcs.h @@ -1,13 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 - 2010 Samsung Electronics Co.Ltd * Author: Joonyoung Shim <jy0922.shim@samsung.com> * Author: HeungJun Kim <riverful.kim@samsung.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 - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * */ #ifndef __LINUX_MCS_H |