[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4BFE7EAC.9090408@suse.cz>
Date: Thu, 27 May 2010 16:16:12 +0200
From: Michal Marek <mmarek@...e.cz>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Randy Dunlap <randy.dunlap@...cle.com>, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org, matt mooney <mfm@...eddisk.com>,
Kirill Smelkov <kirr@....spb.ru>
Subject: Re: linux-next: manual merge of the kbuild tree with the kernel-doc
tree
On 27.5.2010 03:03, Stephen Rothwell wrote:
> Hi Randy,
>
> On Wed, 26 May 2010 17:00:11 -0700 Randy Dunlap <randy.dunlap@...cle.com> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists