git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6dl-icore-mipi.dts
diff --git
a/arch/arm/boot/dts/imx6dl-icore-mipi.dts
b/arch/arm/boot/dts/imx6dl-icore-mipi.dts
index bf53f0552aa17cd5f5525ff5e8e0ee0f0a80deed..e43bccb78ab2ba44130603fb102254a3081ca858 100644
(file)
--- a/
arch/arm/boot/dts/imx6dl-icore-mipi.dts
+++ b/
arch/arm/boot/dts/imx6dl-icore-mipi.dts
@@
-1,4
+1,4
@@
-// SPDX-License-Identifier:
(GPL-2.0+ OR MIT)
+// SPDX-License-Identifier:
GPL-2.0 OR X11
/*
* Copyright (C) 2018 Engicam S.r.l.
* Copyright (C) 2018 Amarula Solutions B.V.