projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ebbda5 35a8578)
Merge branch 'clockevents/3.20' of http://git.linaro.org/people/daniel.lezcano/linux...
authorIngo Molnar <mingo@kernel.org>
Mon, 9 Feb 2015 10:20:36 +0000 (11:20 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 9 Feb 2015 10:20:36 +0000 (11:20 +0100)
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 <mingo@kernel.org>

Trivial merge