Find 7 changes: drivers/power/qpnp-charger.c

Applied to AU_LINUX_ANDROID_JB_3.2.1.04.03.00.086.146

Conflicts:
	drivers/power/qpnp-charger.c
Find 7 changes: drivers/rtc

From LNX.LA.3.2.5-00210-8x74.0

Applied to AU_LINUX_ANDROID_JB_3.2.1.04.03.00.086.146

Conflicts:
	drivers/rtc/alarm-dev.c
	drivers/rtc/alarm.c
Find 7 changes: sound/soc

From LNX.LA.3.2.5-00210-8x74.0

Applied to AU_LINUX_ANDROID_JB_3.2.1.04.03.00.086.146

Conflicts:
	include/sound/q6adm-v2.h
	include/sound/q6asm-v2.h
	include/sound/q6audio-v2.h
	sound/soc/codecs/wcd9xxx-mbhc.c
	sound/soc/msm/msm8974.c
	sound/soc/msm/qdsp6v2/msm-pcm-q6-v2.c
	sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
	sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.h
	sound/soc/msm/qdsp6v2/q6adm.c
	sound/soc/msm/qdsp6v2/q6asm.c
	sound/soc/msm/qdsp6v2/rtac.c