Subject: Re: linux-next: manual merge of the mfd tree with Linus' tree

From: Samuel Ortiz <[email-masked]>
Date: Mon, 13 Sep 2010 15:59:15 +0200

Hi Stephen,

On Mon, Sep 13, 2010 at 11:54:04AM +1000, Stephen Rothwell wrote:
> Hi Samuel,
> 
> Today's linux-next merge of the mfd tree got a conflict in
> arch/arm/mach-shmobile/board-ap4evb.c between commit
> 410d878bd05315a19894b8b4685107f2cd0712a5 ("ARM: mach-shmobile: ap4evb:
> fix write protect for SDHI1") from Linus' tree and commit
> c3cfb4003377a3397b27de0efe910c9abd838ac3 ("ARM: mach-shmobile: ap4evb:
> Fix hotplug for SDHI1") from the mfd tree.
The conflict should be merged by now. Thanks for the warning.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/