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/arch/arm/boot/dts/omap3-igep0030-rev-g.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel/arch/arm/boot/dts/omap3-igep0030-rev-g.dts') diff --git a/kernel/arch/arm/boot/dts/omap3-igep0030-rev-g.dts b/kernel/arch/arm/boot/dts/omap3-igep0030-rev-g.dts index b899e3418..76dc08868 100644 --- a/kernel/arch/arm/boot/dts/omap3-igep0030-rev-g.dts +++ b/kernel/arch/arm/boot/dts/omap3-igep0030-rev-g.dts @@ -1,7 +1,7 @@ /* * Device Tree Source for IGEP COM MODULE Rev. G (TI OMAP AM/DM37x) * - * Copyright (C) 2014 Javier Martinez Canillas + * Copyright (C) 2014 Javier Martinez Canillas * Copyright (C) 2014 Enric Balletbo i Serra * * This program is free software; you can redistribute it and/or modify -- cgit 1.2.3-korg