On Tue, Mar 04, 2008 at 10:01:47PM +0100, Stefan Richter wrote:
quoted text
> Stephen Rothwell wrote:
> >git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git.
> >There were three minor merge problems.
> 
> One of them is tests.git's lib/Kconfig.debug.  linux1394-2.6.git's 
> commit 523a65f1a7a339e528ca6d6d808516fe195fde03 apparently is the one 
> causing it.

I think I have a patch for this somewhere.
But I do not have time to look into this until earliest in the weekend.
And the test.git tree is down on my TODO list as I have pending issues in kbuild.git.

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