From mboxrd@z Thu Jan  1 00:00:00 1970
From: tony@atomide.com (Tony Lindgren)
Date: Tue, 19 Feb 2013 14:00:57 -0800
Subject: [GIT PULL] reworked omap usb pdata changes for v3.9 merge window
In-Reply-To: <201302192130.33509.arnd@arndb.de>
References: <20130215003543.GF11806@atomide.com>
 <201302192130.33509.arnd@arndb.de>
Message-ID: <20130219220057.GK5724@atomide.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

* Arnd Bergmann <arnd@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