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

[Greg KH]

On Wed, Jun 03, 2009 at 08:46:55PM +1000, Stephen Rothwell wrote:
> Hi Alan,
> 
> On Wed, 3 Jun 2009 09:55:47 +0100 Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> wrote:
> >
> > > As a side issue, the last patch has no SOB from Craig in the ttydev tree.
> > 
> > Yes it does...
> > 
> >     Signed-off-by: Craig Shelley <craig@xxxxxxxxxxxxxxxx>
> >     
> >     (Fixed some collisions merging)
> >     
> >     Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
> 
> Sorry, going blind in my old age :-)
> 
> > > So, I just used the ttydev tree version on the assumption that my
> > > reasoning above is correct.
> > 
> > and the ttydev tree one is the one to use
> 
> Thanks for the confirmation.

Ok, I'll drop these three patches from my tree.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/