Merge branch 'cm-11.0' into 8660-tp-merge
Revert "msm: qdsp6v2: Deleting kernel driver from arch/arm/mach-msm/qdsp6v2"

This reverts commit bfbd3f6bb3e0214140c63fe0cb1a092dcdba14f8.
Revert "Kconfig: make SDIO_AL selectable across all 8x60 devices"

This reverts commit 05c76d77810a735eaef9ff42842580ec237fcc69.
Merge remote-tracking branch 'flemmard/8660-tp-merge' into HEAD
Revert "msm: Remove old unused sdio related code"

This reverts commit 3aef75517baa20e14dcd931292f1786086651e44.
Kconfig: make SDIO_AL selectable across all 8x60 devices

Change-Id: Ibd53512a682c978071d01d1a24dc87be1128db57