Re: linux-next: manual merge of the staging tree with the pcmciatree

[Stephen Rothwell]

Hi Greg,

On Fri, 20 Nov 2009 10:29:03 -0800 Greg KH <greg@xxxxxxxxx> wrote:
>
> On Mon, Nov 09, 2009 at 06:15:44PM +1100, Stephen Rothwell wrote:
> > 
> > I fixed it up (using the pcmcia tree version when there is a clash) and
> > can carry the fix as necessary.
> > 
> > [Greg, that staging tree commit has no SOB from its author ...]
> 
> Good catch, I missed that :(
> 
> I've now dropped this patch from my tree, so it should be fine now.

OK, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature