From: Olof Johansson Date: Tue, 8 Jan 2013 18:51:01 +0000 (-0800) Subject: Merge branch 'timer/cleanup' into next/cleanup X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fd41d91df99be02f4fc3fe79d707d2786d6e40eb;p=linux-beck.git Merge branch 'timer/cleanup' into next/cleanup Adding a manually applied bugfix for sunxi. * timer/cleanup: ARM: sunxi: fix struct sys_timer removal Signed-off-by: Olof Johansson --- fd41d91df99be02f4fc3fe79d707d2786d6e40eb