Merge remote-tracking branch 'omap/hsmmc' into for_3.4/cleanup/pm-base