On Tue, Jul 23, 2013 at 4:40 PM, Stephen Boyd <sb...@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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
