[GIT PULL] Remove ARM local timer API

Olof Johansson olof at lixom.net
Tue Jul 23 19:56:09 EDT 2013


On Tue, Jul 23, 2013 at 4:40 PM, Stephen Boyd <sboyd at codeaurora.org> wrote:
> On 07/23, Olof Johansson wrote:

>> Merged in as localtimer/removal into next/cleanup.
>>
>> I had quite a few merge conflicts due to the __cpuinit removal, so
>> please double-check my resolutions.
>>
>
> A __cpuinit is leftover in smp_twd.c. Hopefully you can just
> redo the merge?

Done, thanks for catching it. I thought I grepped for them but I
somehow missed that one. Fixed now.


-Olof



More information about the linux-arm-kernel mailing list