Re: linux-next: manual merge of the net-next tree with the sparc-next tree | netdev | Ratatoskr

linux-next: manual merge of the net-next tree with the sparc-next tree · Stephen Rothwell <hidden> · 2012-05-16
Re: linux-next: manual merge of the net-next tree with the sparc-next tree · Sam Ravnborg <hidden> · 2012-05-16
Re: linux-next: manual merge of the net-next tree with the sparc-next tree · Stephen Rothwell <hidden> · 2012-05-17
Re: linux-next: manual merge of the net-next tree with the sparc-next tree · Sam Ravnborg <hidden> · 2012-05-17

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

From: Sam Ravnborg <hidden>
Date: 2012-05-17 05:54:15
Also in: linux-next, lkml

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