From mboxrd@z Thu Jan  1 00:00:00 1970
From: Greg KH <greg@kroah.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the mfd
 tree
Date: Wed, 28 Nov 2012 21:19:26 -0800
Message-ID: <20121129051926.GH4375@kroah.com>
References: <20121129151804.a133338f9738b25d3ccf2e6f@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from out4-smtp.messagingengine.com ([66.111.4.28]:38576 "EHLO
	out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1750907Ab2K2FRt (ORCPT
	<rfc822;linux-next@vger.kernel.org>);
	Thu, 29 Nov 2012 00:17:49 -0500
Content-Disposition: inline
In-Reply-To: <20121129151804.a133338f9738b25d3ccf2e6f@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Bill Pemberton <wfp5p@virginia.edu>, Fabio Estevam <fabio.estevam@freescale.com>, Samuel Ortiz <sameo@linux.intel.com>

On Thu, Nov 29, 2012 at 03:18:04PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/power/da9052-battery.c between commit 4b5edf7887c6 ("power:
> da9052-battery: Convert to the new da9052 interrupt functions") from the
> mfd tree and commit c8afa6406e60 ("power: remove use of __devinit") from
> the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.

greg k-h