Subject: Re: linux-next: manual merge of the net-next tree with the sparc-next tree

From: Sam Ravnborg <[email-masked]>
Date: Thu, 17 May 2012 07:54:10 +0200

> So I applied this merge fixup to the merge of the net-next tree today
> (and can carry it as necessary):

Perfect. And please carry this as we do not plan to solve this
conflict.

	Sam