Re: linux-next: manual merge of the kbuild tree with the kernel-doctree

[Stephen Rothwell]

Hi Michal,

On Thu, 27 May 2010 16:16:12 +0200 Michal Marek <mmarek@xxxxxxx> wrote:
>
> On 27.5.2010 03:03, Stephen Rothwell wrote:
> > Hi Randy,
> > 
> > On Wed, 26 May 2010 17:00:11 -0700 Randy Dunlap <randy.dunlap@xxxxxxxxxx> wrote:
> >> uh oh.  OK, thanks, I'll restore them.
> > 
> > Thanks.  I picked them up.
> 
> I reverted part of the kbuild patch so that the two trees merge cleanly
> again.

Thanks.

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

Attachment: pgp00000.pgp
Description: PGP signature