mmc: core: Fix #ifdef for new wifi driver
wifi: Revert to card detect routine from stock kernel
net: wireless: bcmdhd: Disable MAX power saving mode as disabled by Samsung
Merge remote-tracking branch 'upstream/jb-3.0' into jb-3.0_pmem