summaryrefslogtreecommitdiffstats
path: root/kernel/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
diff options
context:
space:
mode:
authorJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-04-11 10:41:07 +0300
committerJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-04-13 08:17:18 +0300
commite09b41010ba33a20a87472ee821fa407a5b8da36 (patch)
treed10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
parentf93b97fd65072de626c074dbe099a1fff05ce060 (diff)
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page. During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi')
-rw-r--r--kernel/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi b/kernel/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
index 4a1820309..469ef58ce 100644
--- a/kernel/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
+++ b/kernel/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
@@ -10,9 +10,8 @@
* whole.
*
* a) This file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License.
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
*
* This file is distributed in the hope that it will be useful
* but WITHOUT ANY WARRANTY; without even the implied warranty of