diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-06-19 12:32:13 +0200 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-06-19 12:32:13 +0200 |
commit | bcb7416e3480c1abb46266bdab874b3b3d6124cb (patch) | |
tree | 9d889b14957c0e266697d0674675bc42b0899571 /drivers/spi/spi-st-ssc4.c | |
parent | 90b2df5743cd92f4525f662e8f12a536dfb58557 (diff) | |
parent | 52d2d44eee8091e740d0d275df1311fb8373c9a9 (diff) | |
download | talos-op-linux-bcb7416e3480c1abb46266bdab874b3b3d6124cb.tar.gz talos-op-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 'drivers/spi/spi-st-ssc4.c')
-rw-r--r-- | drivers/spi/spi-st-ssc4.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-st-ssc4.c b/drivers/spi/spi-st-ssc4.c index a4e43fc19ece..840a6bf81336 100644 --- a/drivers/spi/spi-st-ssc4.c +++ b/drivers/spi/spi-st-ssc4.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2008-2014 STMicroelectronics Limited * @@ -6,9 +7,6 @@ * Lee Jones <lee.jones@linaro.org> * * SPI master mode controller driver, used in STMicroelectronics devices. - * - * May be copied or modified under the terms of the GNU General Public - * License Version 2.0 only. See linux/COPYING for more information. */ #include <linux/clk.h> |