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

From: Michal Marek <[email-masked]>
Date: Thu, 27 May 2010 16:16:12 +0200

On 27.5.2010 03:03, Stephen Rothwell wrote:
> Hi Randy,
> 
> On Wed, 26 May 2010 17:00:11 -0700 Randy Dunlap <[email-masked]> 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.

Michal