Thomas Gleixner cfb6d656d5 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>		2013-08-21 14:59:23 +02:00
..
asm	Merge branch 'timers/clockevents-next' of git://git.linaro.org/people/dlezcano/clockevents into timers/core	2013-08-21 14:59:23 +02:00
debug	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2013-07-03 09:46:29 -07:00
uapi/asm	ARM: 7791/1: a.out: remove partial a.out support	2013-07-26 12:02:10 +01:00