From: Ingo Molnar Date: Mon, 9 Feb 2015 10:20:36 +0000 (+0100) Subject: Merge branch 'clockevents/3.20' of http://git.linaro.org/people/daniel.lezcano/linux... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f40d149b58f5dea148ceaee5f9249da133e5004c;p=linux-beck.git Merge branch 'clockevents/3.20' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core Pull clockevents updates from Daniel Lezcano: - Add new driver for the Conexant Digicolor SoCs (Baruch Siach) - Add new driver for the rockchip rk3288 board (Daniel Lezcano) - Add new asm9260 driver for MIPS (Oleksij Rempel) - Add DT definitions for the versatile AB/PB boards (Rob Herring) - Rename the 'marco' timer to 'atlas7' (Barry Song) Signed-off-by: Ingo Molnar --- f40d149b58f5dea148ceaee5f9249da133e5004c