From mboxrd@z Thu Jan  1 00:00:00 1970
From: Sam Ravnborg <sam@ravnborg.org>
Subject: Re: linux-next: manual merge of the net-next tree with the
	sparc-next tree
Date: Thu, 17 May 2012 07:54:10 +0200
Message-ID: <20120517055410.GA2247@merkur.ravnborg.org>
References: <20120516143944.57a648287aa5cd1a5930254e@canb.auug.org.au> <20120516050245.GA407@merkur.ravnborg.org> <20120517130406.1706f944820bbe8dc5e368f2@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: David Miller <davem@davemloft.net>, netdev@vger.kernel.org,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Return-path: <linux-next-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <20120517130406.1706f944820bbe8dc5e368f2@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-Id: netdev.vger.kernel.org

> 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