From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: linux-next: sparc/firmware build failure
Date: Mon, 01 Sep 2008 02:46:52 -0700 (PDT)
Message-ID: <20080901.024652.155907138.davem@davemloft.net>
References: <20080901191019.5df57434.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:35408
	"EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK)
	by vger.kernel.org with ESMTP id S1751657AbYIAJq6 (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Mon, 1 Sep 2008 05:46:58 -0400
In-Reply-To: <20080901191019.5df57434.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: sfr@canb.auug.org.au
Cc: dwmw2@infradead.org, linux-next@vger.kernel.org, jaswinder@infradead.org

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 1 Sep 2008 19:10:19 +1000

> I have applied the following patch.  I will carry this patch unless a
> better solution comes along.

That patch is the proper way to resolve this merge conflict, please
carry it :-)