aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/dma/k3-psil.h
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2020-08-25 11:00:02 +0200
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2020-08-25 11:00:02 +0200
commit2d9ad4cfaf4d32a64a4ed556e5bcab9121215026 (patch)
tree3572e6cd05effa4e2943cee817defb2b9a72afd1 /include/linux/dma/k3-psil.h
parent77ef38574beb3e0b414db48e9c0f04633df68ba6 (diff)
parentd012a7190fc1fd72ed48911e77ca97ba4521bccd (diff)
downloadkernel_replicant_linux-2d9ad4cfaf4d32a64a4ed556e5bcab9121215026.tar.gz
kernel_replicant_linux-2d9ad4cfaf4d32a64a4ed556e5bcab9121215026.tar.bz2
kernel_replicant_linux-2d9ad4cfaf4d32a64a4ed556e5bcab9121215026.zip
Merge tag 'v5.9-rc2' into drm-misc-fixes
Backmerge requested by Tomi for a fix to omap inconsistent locking state issue, and because we need at least v5.9-rc2 now. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'include/linux/dma/k3-psil.h')
-rw-r--r--include/linux/dma/k3-psil.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dma/k3-psil.h b/include/linux/dma/k3-psil.h
index 61d5cc0ad601..1962f75fa2d3 100644
--- a/include/linux/dma/k3-psil.h
+++ b/include/linux/dma/k3-psil.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
- * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com
+ * Copyright (C) 2019 Texas Instruments Incorporated - https://www.ti.com
*/
#ifndef K3_PSIL_H_