Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.059 on remote branch

Change-Id: I691dfcf7eb0a035164ee7162ff46ce05823b0490
Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.059 on remote branch"
Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.060 on remote branch

Change-Id: I50b57c78b7ed81dd3f373f4e4d2c333e584f98f4
Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.060 on remote branch"
Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.061 on remote branch

Change-Id: I6888a2aaf3d3804594cf09597a33b9f43b29c75f
Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.061 on remote branch"
power: pm8921: M4 uses lpm_wrkarnd as well

Change-Id: Ifc86e0612c0af3f2cca2e401f75f52f324075d99
Merge remote-tracking branch 'codeaurora/caf/kk_2.7_rb1.40' into cm-11.0

Conflicts:
	drivers/media/video/msm/csi/msm_ispif.c
	drivers/media/video/msm/msm_mctl_pp.c

Change-Id: Iedfd6dc3e8dea93df993e0b043ab5eee55784a12
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0