Merge branch 'jellybean' into jb-wifi
Updated hsmmc code for wl12xx support.

Signed-off-by: David Rodero <david@codiguiel.net>