Merge branch 'jb_2.6' of git://codeaurora.org/platform/hardware/qcom/audio into cm-10.2

Change-Id: I0c46e2f0052d8e300a792f16e02d0042d8e68044