From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 29 Apr 2014 17:26:58 +0000 (+0200)
Subject: Merge branch 'clockevents/3.15-fixes' of git://git.linaro.org/people/daniel.lezcano... 
X-Git-Tag: v3.15-rc4~5^2~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=fb0095da19a2e905dfa3141a7704d9614f64992c;p=linux.git

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
---

fb0095da19a2e905dfa3141a7704d9614f64992c