Messages in this thread | | | Date | Tue, 23 Jul 2013 16:56:09 -0700 | Subject | Re: [GIT PULL] Remove ARM local timer API | From | Olof Johansson <> |
| |
On Tue, Jul 23, 2013 at 4:40 PM, Stephen Boyd <sboyd@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
| |