linux-next: manual merge of the mmc-uh tree with the arm-soc tree
nicolas.ferre at atmel.com
Mon Nov 10 00:58:59 PST 2014
On 10/11/2014 02:56, Stephen Rothwell :
> Hi Ulf,
> Today's linux-next merge of the mmc-uh tree got a conflict in
> arch/arm/mach-at91/at91sam9g45_devices.c between commit 4bf7753b8ab7
> ("ARM: at91: remove at91sam9g45/9m10 legacy board support") from the
> arm-soc tree and commit 4049854c41e0 ("ARM: at91: remove
> mach/atmel-mci.h") from the mmc-uh tree.
> I fixed it up (I just removed the file) and can carry the fix as
> necessary (no action is required).
Well fixed. Thanks Stephen.
More information about the linux-arm-kernel