Merge branch 'clockevents/fixes' of git://git.linaro.org/people/dlezcano/linux into...
authorThomas Gleixner <tglx@linutronix.de>
Tue, 26 Nov 2013 18:00:32 +0000 (19:00 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 26 Nov 2013 18:00:32 +0000 (19:00 +0100)
commit70fe8217e17ddd058f9f043ae1cc0d86b1658a5c
treefaa7a9ebc5bdc024eb4d5f107283ad94b44cf529
parent4be77398ac9d948773116b6be4a3c91b3d6ea18c
parent77f7ce9a9f636daaa65731a833bae1311a7b80e5
Merge branch 'clockevents/fixes' of git://git.linaro.org/people/dlezcano/linux into timers/urgent

 * Hide event stream Kconfig option for the arch_arm_timer for ARM=n
 * Fix a missing a clk_put in case the registering of the sh_mtu[2] drivers fails.
 * Reuse clockevents_config_and_register for the at91rm9200_time timer