linux-next: manual merge of the mmc-uh tree with the arm-soc tree
sfr at canb.auug.org.au
Sun Nov 9 17:56:37 PST 2014
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).
Stephen Rothwell sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 819 bytes
Desc: OpenPGP digital signature
More information about the linux-arm-kernel