diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 13:53:20 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 13:53:20 +0200 |
commit | 888dc273ea4e7ca332a6f73d10dfc8f2b212c803 (patch) | |
tree | 0c2154dfa92ca6ee761c358e58a3e35831558bb5 /drivers/spi/spi-fsl-lib.c | |
parent | tty: cpm_uart: drop unused iflag macro (diff) | |
parent | Linux 5.2-rc3 (diff) | |
download | linux-dev-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.tar.xz linux-dev-888dc273ea4e7ca332a6f73d10dfc8f2b212c803.zip |
Merge 5.2-rc3 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/spi/spi-fsl-lib.c')
-rw-r--r-- | drivers/spi/spi-fsl-lib.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/spi/spi-fsl-lib.c b/drivers/spi/spi-fsl-lib.c index 1e43412cd9f8..76e1192eb025 100644 --- a/drivers/spi/spi-fsl-lib.c +++ b/drivers/spi/spi-fsl-lib.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale SPI/eSPI controller driver library. * @@ -10,11 +11,6 @@ * Author: Anton Vorontsov <avorontsov@ru.mvista.com> * * Copyright 2010 Freescale Semiconductor, Inc. - * - * 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. */ #include <linux/dma-mapping.h> #include <linux/fsl_devices.h> |