Merge pull request #12 from jied83/jellybean

disable MMC_CAP_ERASE
Merge branch 'jied83' upstream 06-26-2013