Fixes branch from MFD and MMC based on 3.15-rc4.