Merge branch 'cm-10.1' of git://github.com/razrqcom-dev-team/android_kernel_motorola_msm8960-common into jb2
revert to ION
Conflicts:
	arch/arm/mach-msm/qdsp6v2/audio_lpa.c
	arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
	arch/arm/mach-msm/qdsp6v2/audio_utils_aio.h
	sound/soc/msm/qdsp6/q6asm.c

	modified:   arch/arm/configs/msm8960_mmi_defconfig
	new file:   arch/arm/configs/msm8960_mmi_phablet_defconfig
	modified:   arch/arm/mach-msm/Kconfig
	modified:   arch/arm/mach-msm/Makefile
	modified:   arch/arm/mach-msm/board-8960.c
	modified:   arch/arm/mach-msm/board-msm8960-common.c
	modified:   arch/arm/mach-msm/include/mach/qdsp6v2/audio_acdb.h
	modified:   arch/arm/mach-msm/qdsp6v2/Makefile
	modified:   arch/arm/mach-msm/qdsp6v2/aac_in.c
	modified:   arch/arm/mach-msm/qdsp6v2/amrnb_in.c
	modified:   arch/arm/mach-msm/qdsp6v2/amrwb_in.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_aac.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_amrnb.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_amrwb.c
	new file:   arch/arm/mach-msm/qdsp6v2/audio_amrwbplus.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_evrc.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_lpa.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_mp3.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_multi_aac.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_qcelp.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_utils.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_utils.h
	modified:   arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_utils_aio.h
	modified:   arch/arm/mach-msm/qdsp6v2/audio_wma.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_wmapro.c
	modified:   arch/arm/mach-msm/qdsp6v2/dsp_debug.c
	modified:   arch/arm/mach-msm/qdsp6v2/evrc_in.c
	new file:   arch/arm/mach-msm/qdsp6v2/q6audio_common.h
update make and config
Merge branch 'jb2' of https://github.com/jsnweitzel/vanquish into jb2

Conflicts:
	arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c

	modified:   arch/arm/mach-msm/qdsp6v2/audio_aac.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_amrnb.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_amrwb.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_amrwbplus.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_evrc.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_lpa.h
	modified:   arch/arm/mach-msm/qdsp6v2/audio_mp3.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_multi_aac.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_qcelp.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_wma.c
	modified:   arch/arm/mach-msm/qdsp6v2/audio_wmapro.c
	modified:   arch/arm/mach-msm/qdsp6v2/rtac.c
	modified:   include/linux/msm_audio_aac.h
	modified:   include/sound/apr_audio.h
	modified:   include/sound/q6asm.h
	modified:   sound/soc/msm/qdsp6/q6asm.c