[GIT PULL] ARM: mvebu: fixes for v3.12

Olof Johansson
2013-09-20T17:36:32Z

On Thu, Sep 19, 2013 at 8:46 PM, Jason Cooper <jason@lakedaemon.net> wrote:
> Guys,
>
> We have a relatively long list of fixes this time around. The two
> of_node_put()'s were left over from before the merge window (part of
> mvebu/fixes-non-critical).
>
> The two for the Armada XP clocks are to fix booting v3.12-rc1 since the
> corresponding driver changes were merged at the last minute. These were
> originally part of mvebu/dt for v3.12, but have since become fixes.
>
> The other two just cropped up since v3.12-rc1 dropped.

Pulled, thanks.

I noticed a couple of the patches had conflict messages in the patch
description. They're sometimes useful on merges but less so on patches
(likely just from needing fixups when cherry-picked?). Not a big deal,
but something to keep in mind in the future.

-Olof