[GIT PULL 2/5] ARM: imx: soc changes for 3.12

[Shawn Guo]

On Thu, Aug 22, 2013 at 07:59:34AM -0700, Kevin Hilman wrote:
> Yes, the conflict is trivial, but having seen several similar ones
> this merge window, it's getting kinda old.  Also, I'm not crazy about
> having Linus see several merge conflicts to the same area.  He'll see
> that arm-soc folks are not properly coordinating things with Russell
> and IMO that's something we need to fix in ARM land, not expose it to
> Linus.

Understood.

> 
> Also, in the future, if you're already aware of merge conflicts in
> -next in a branch you're submitting for a pull request, it would be
> *very* helpful to mention that in the pull request.

Okay, got it.

<snip>

> > [1] https://lkml.org/lkml/2013/6/3/22
> 
> Seems this is an unrelated conflict to the one I was seeing in Kconfig.debug

Sorry, gave the wrong link.  It should be:

http://article.gmane.org/gmane.linux.kernel.next/28290

Shawn