diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-09 09:11:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-09 09:11:21 +0200 |
| commit | 0154ec71d597692a0d0682b19eac4b3adfb7f3dc (patch) | |
| tree | 121b4ac35146f5696da090d3ae2534c76523e6c2 /include/linux/platform_data/dma-ste-dma40.h | |
| parent | VMCI: Fixup atomic64_t abuse (diff) | |
| parent | Linux 5.2-rc4 (diff) | |
| download | linux-dev-0154ec71d597692a0d0682b19eac4b3adfb7f3dc.tar.xz linux-dev-0154ec71d597692a0d0682b19eac4b3adfb7f3dc.zip | |
Merge 5.2-rc4 into char-misc-next
We want the char/misc driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/platform_data/dma-ste-dma40.h')
| -rw-r--r-- | include/linux/platform_data/dma-ste-dma40.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/platform_data/dma-ste-dma40.h b/include/linux/platform_data/dma-ste-dma40.h index 1bb9b1852256..10641633facc 100644 --- a/include/linux/platform_data/dma-ste-dma40.h +++ b/include/linux/platform_data/dma-ste-dma40.h @@ -1,8 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson SA 2007-2010 * Author: Per Forlin <per.forlin@stericsson.com> for ST-Ericsson * Author: Jonas Aaberg <jonas.aberg@stericsson.com> for ST-Ericsson - * License terms: GNU General Public License (GPL) version 2 */ |