diff options
| author | Mark Brown <broonie@kernel.org> | 2019-06-18 20:12:47 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-18 20:12:47 +0200 |
| commit | e1d700f7c94e755106749411706a38e39a93404b (patch) | |
| tree | b1230cb7eba5a4ef28ed2cd2527d9ac78f06cc00 /drivers/tee/optee/shm_pool.c | |
| parent | regulator: qcom_spmi: Refactor get_mode/set_mode (diff) | |
| parent | Linux 5.2-rc4 (diff) | |
| download | linux-e1d700f7c94e755106749411706a38e39a93404b.tar.xz linux-e1d700f7c94e755106749411706a38e39a93404b.zip | |
Merge tag 'v5.2-rc4' into regulator-5.3
Linux 5.2-rc4
Diffstat (limited to 'drivers/tee/optee/shm_pool.c')
| -rw-r--r-- | drivers/tee/optee/shm_pool.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/tee/optee/shm_pool.c b/drivers/tee/optee/shm_pool.c index 49397813fff1..de1d9b8fad90 100644 --- a/drivers/tee/optee/shm_pool.c +++ b/drivers/tee/optee/shm_pool.c @@ -1,16 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2015, Linaro Limited * Copyright (c) 2017, EPAM Systems - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * */ #include <linux/device.h> #include <linux/dma-buf.h> |