Merge branch 'jellybean' into jb-wifi
wl12xx: Updated wl12xx_platform_data

Signed-off-by: David Rodero <david@codiguiel.net>
fix wl12xx platform data

Signed-off-by: David Rodero <david@codiguiel.net>
wl12xx: updated header file

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