[GIT PULL] ARM: mvebu soc changes for v3.15

[Olof Johansson]

On Fri, Feb 21, 2014 at 4:59 PM, Jason Cooper <jason at lakedaemon.net> wrote:
> On Fri, Feb 21, 2014 at 04:34:15PM -0800, Olof Johansson wrote:
>> On Tue, Feb 18, 2014 at 11:36:28AM -0500, Jason Cooper wrote:
>> > All,
>> >
>> > A small round of changes that have been sitting in -next for a week or
>> > so.  Please pull.
>> >
>> > thx,
>> >
>> > Jason.
>> >
>> >
>> > The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:
>> >
>> >   Linus 3.14-rc1 (2014-02-02 16:42:13 -0800)
>> >
>> > are available in the git repository at:
>> >
>> >   git://git.infradead.org/linux-mvebu.git tags/mvebu-soc-3.15
>> >
>> > for you to fetch changes up to 08bb3adfd3adeb4653095e7968b6a46cef940404:
>> >
>> >   ARM: mvebu: remove unneeded ->map_io field for Armada 370/XP (2014-02-11 19:33:04 +0000)
>>
>> Thanks, merged into next/cleanup.
>
> Heads up:  I'm currently basing mvebu/soc-3xx on top of this work to
> avoid keeping track of a tricky modify/rename merge.  Namely, removing
> map_io in the above, and the mvebu/soc-3xx branch renames the same file.
>
> As long as you don't mind having a branch depending on next/cleanup, all
> should be good.  No action required.

It's depending on the mvebu branch in next/cleanup, and that's just
fine -- we actually encourage that flow of branch dependencies.



-Olof