[GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13

[Kevin Hilman]

On Thu, Oct 10, 2013 at 3:02 PM, Kevin Hilman <khilman at linaro.org> wrote:
> Simon Horman <horms at verge.net.au> writes:
>
>> On Tue, Oct 08, 2013 at 06:05:24PM +0900, Simon Horman wrote:
>>> Hi Kevin, Olof and Arnd,
>>>
>>> please consider this Second round of Renesas ARM based SoC cleanups for v3.13.
>>> It is based on renesas-cleanup-for-v3.13 which you have previously pulled.
>>
>> This pull-request causes some conflicts in
>> arch/arm/mach-shmobile/board-bockw.c. In general the resolution
>> strategy should be to take everything.
>
> Thanks for the heads up.  I assume you meant board-lager.c though,
> right?  That's where I saw the conflict.

Nevermind, I see the conflict you were referring to now.

The one I found was a conflict between your first cleanup tag and this
one.  Feel free to base subsequent cleanup branches on the previous
ones if there are dependencies/conflicts like this.

Kevin