diff options
author | Jason Gunthorpe | 2019-07-02 19:34:43 +0200 |
---|---|---|
committer | Jason Gunthorpe | 2019-07-02 19:34:43 +0200 |
commit | 9ec3f4cb35bc8278f0582fed9f9229c9315c2ffb (patch) | |
tree | 3ff6a17a33913268a2ed06e7d9a1a95e29eeee97 /include/linux/mfd/stmpe.h | |
parent | mm/swap: fix release_pages() when releasing devmap pages (diff) | |
parent | Linux 5.2-rc7 (diff) | |
download | kernel-qcow2-linux-9ec3f4cb35bc8278f0582fed9f9229c9315c2ffb.tar.gz kernel-qcow2-linux-9ec3f4cb35bc8278f0582fed9f9229c9315c2ffb.tar.xz kernel-qcow2-linux-9ec3f4cb35bc8278f0582fed9f9229c9315c2ffb.zip |
Merge tag 'v5.2-rc7' into rdma.git hmm
Required for dependencies in the next patches.
Diffstat (limited to 'include/linux/mfd/stmpe.h')
-rw-r--r-- | include/linux/mfd/stmpe.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/stmpe.h b/include/linux/mfd/stmpe.h index 07f55aac9390..87e29d561e22 100644 --- a/include/linux/mfd/stmpe.h +++ b/include/linux/mfd/stmpe.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson SA 2010 * - * License Terms: GNU General Public License, version 2 * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson */ |