linux-next: manual merge of the arm-soc tree with the mmc tree

[Stephen Rothwell]

Hi all,

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 commits
cf3a6ec2c0a4 ("ARM: OMAP: remove plat/board.h file") and 70c494c3122f
("ARM: OMAP1: Make plat/mux.h omap1 only") from the arm-soc tree.

The former removed a superset of include files, so I did that and can
carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature