| commit | fb0095da19a2e905dfa3141a7704d9614f64992c | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Tue Apr 29 19:26:58 2014 +0200 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Tue Apr 29 19:26:58 2014 +0200 |
| tree | 2d2c0269ee183afae555ae2df3c185e97d96f9e4 | |
| parent | d1db0eea852497762cab43b905b879dfcd3b8987 [diff] | |
| parent | 9afa27ce9414c92e271b0d7eec937bd9f5565da5 [diff] |
Merge branch 'clockevents/3.15-fixes' of git://git.linaro.org/people/daniel.lezcano/linux into timers/urgent clockevent fixes for 3.15 from Daniel Lezcano: * Lorenzo Pieralizi fixed an issue with the arch_arm_timer where the C3STOP flag for all the arch can cause some trouble by setting the flag only if the power domain is not always on * Alexander Shiyan fixed a compilation by changing the init function to the right prototype