Merge 'mmc/upstream' into late/mvebu2