linux-next: manual merge of the arm-soc tree with the mmc tree
sfr at canb.auug.org.au
Mon Sep 17 04:01:57 EDT 2012
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mmc/host/omap.c between commit 2976837c6ea8 ("mmc: omap: remove
unused variables and includes") from the mmc tree and commit cf3a6ec2c0a4
("ARM: OMAP: remove plat/board.h file") from the arm-soc tree.
The latter is a subset of the former.
I fixed it up 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: 836 bytes
Desc: not available
More information about the linux-arm-kernel