Merge branch 'timers/clockevents-next' of...

Merge branch 'timers/clockevents-next' of git://git.linaro.org/people/dlezcano/clockevents

 into timers/core

* Support for memory mapped arch_timers
* Trivial fixes to the moxart timer code
* Documentation updates

Trivial conflicts in drivers/clocksource/arm_arch_timer.c. Fixed up
the newly added __cpuinit annotations as well.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>