[GIT PULL 3/3] ARM: mvebu: register map changes for v3.11

Olof Johansson olof at lixom.net
Fri Jun 14 18:21:19 EDT 2013


On Thu, Jun 13, 2013 at 05:36:51PM -0400, Jason Cooper wrote:
> Arnd, Olof,
> 
> This branch is off by itself because it depends on mvebu/cleanup and
> mvebu/fixes-non-critical.  It's been in linux-next about a week and has
> an squirrelly merge conflict with armada-370-xp.c.  I've attached the
> resolution to the bottom of this email.
> 
> If you have any questions or if there is a better way for me to format
> this, please let me know.

Merged. Please check my conflict resolution once I push it out, but end delta
is similar.


-Olof



More information about the linux-arm-kernel mailing list