[GIT PULL] reworked omap usb pdata changes for v3.9 merge window

[Tony Lindgren]

* Arnd Bergmann <arnd at arndb.de> [130219 13:34]:
> On Friday 15 February 2013, Tony Lindgren wrote:
> > Hi Arnd & Olof,
> > 
> > Roger Quadros reworked the OMAP USB patches that were causing
> > a conflict in Linux next and we requested to be dropped from
> > Linux next and reworked to remove the dependencies between
> > core SoC code and the driver code.
> > 
> > Below is a pull request for the mach-omap2 specific parts, the
> > rest is driver specific and queued by Samuel in the MFD tree
> > and Greg for the USB changes.
> > 
> > I've left it unresolved so you can merge it into one of your
> > branches as a dependency so we can avoid the merge conflict
> > in Linux next. A link to the merge resolution done by Stephen
> > is in the pull request. Let me know if you want me to resolve
> > it instead. 
> 
> I've pulled them into next/soc now. I was wondering whether to
> put them into the late/omap branch instead, but this seemed
> like the easiest way to resolve the conflict, and the patches
> are simple enough.

OK thanks!

Tony