msm: audio: Merging 01
modified:   arch/arm/mach-msm/qdsp6v2/board-msm8x60-audio.c
Signed-off-by: cholokei <leesl0416@naver.com>
msm: audio: Merging 02
modified:   arch/arm/mach-msm/qdsp6v2/board-msm8x60-audio.c
Signed-off-by: cholokei <leesl0416@naver.com>