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/drivers/clk/spear/spear1310_clock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'kernel/drivers/clk/spear/spear1310_clock.c') diff --git a/kernel/drivers/clk/spear/spear1310_clock.c b/kernel/drivers/clk/spear/spear1310_clock.c index 4daa59777..009bd1410 100644 --- a/kernel/drivers/clk/spear/spear1310_clock.c +++ b/kernel/drivers/clk/spear/spear1310_clock.c @@ -4,14 +4,13 @@ * SPEAr1310 machine clock framework source file * * Copyright (C) 2012 ST Microelectronics - * Viresh Kumar + * Viresh Kumar * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ -#include #include #include #include -- cgit 1.2.3-korg