Merge 15.2.A.1.12 sony release kernel source
prima: fix build

Change-Id: Id3e7b2e43e4387a6818a6c4918a5c1cd92b4e658
Signed-off-by: Arnav Gupta <championswimmer@aokp.co>
prima: strip prima wlan

Change-Id: I8e0cc5e910946968701649b510a3029815387cd9
msm_fb: bulk update from kk_2.7_rb1.20
msm/vidc: bulk update from kk_2.7_rb1.20
sound/qdsp6v2: bulk update from kk_2.7_rb1.20
Fix Gcc4.7 warnings
nicki: updated defconfig