mmc: core: merge resolution

Miscellaneous merge resolutions in mmc.

Signed-off-by: Steve Muckle <smuckle@codeaurora.org>
1 file changed