revert: 'massive update mmc: backported from kernel 3.0 and and other fixes'