diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-11-26 19:00:32 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-11-26 19:00:32 +0100 |
| commit | 70fe8217e17ddd058f9f043ae1cc0d86b1658a5c (patch) | |
| tree | faa7a9ebc5bdc024eb4d5f107283ad94b44cf529 /kernel/time | |
| parent | 4be77398ac9d948773116b6be4a3c91b3d6ea18c (diff) | |
| parent | 77f7ce9a9f636daaa65731a833bae1311a7b80e5 (diff) | |
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
Diffstat (limited to 'kernel/time')
0 files changed, 0 insertions, 0 deletions