linux-next: manual merge of the mmc tree with Linus' tree

[Stephen Rothwell]

Hi Chris,

Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/sdhci-of-core.c between commit b1608d69cb80
("drivercore: revert addition of of_match to struct device") from Linus'
tree and commit e2d0d7dc5542 ("mmc: sdhci: make sdhci-of device drivers
self registered") from the mmc tree.

The latter removes the file, so I did that (I *think* that the change
from the former is no longer needed, but someone should check).
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature