Re: linux-next: manual merge of the usb tree with the arm-soc tree

From: Felipe Balbi
Date: Wed Oct 05 2011 - 06:54:01 EST


Hi,

On Wed, Oct 05, 2011 at 09:51:33PM +1100, Stephen Rothwell wrote:
> Hi,
>
> On Wed, 5 Oct 2011 11:52:39 +0300 Felipe Balbi <balbi@xxxxxx> wrote:
> >
> > looks ok, but I don't see omap_phy_internal.o being added anywhere.
> > Maybe this hunk doesn't show...
>
> Yeah, it didn't conflict, so there is a
>
> obj-y += omap_phy_internal.o
>
> line a bit further down.

nice, looks good then :-)

--
balbi

Attachment: signature.asc
Description: Digital signature