From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: 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. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- kernel/Documentation/devicetree/bindings/reset/st,sti-softreset.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kernel/Documentation/devicetree/bindings/reset/st,sti-softreset.txt') diff --git a/kernel/Documentation/devicetree/bindings/reset/st,sti-softreset.txt b/kernel/Documentation/devicetree/bindings/reset/st,sti-softreset.txt index a8d3d3c25..891a2fd85 100644 --- a/kernel/Documentation/devicetree/bindings/reset/st,sti-softreset.txt +++ b/kernel/Documentation/devicetree/bindings/reset/st,sti-softreset.txt @@ -42,5 +42,5 @@ example: Macro definitions for the supported reset channels can be found in: -include/dt-bindings/reset-controller/stih415-resets.h -include/dt-bindings/reset-controller/stih416-resets.h +include/dt-bindings/reset/stih415-resets.h +include/dt-bindings/reset/stih416-resets.h -- cgit 1.2.3-korg