Merge "msm: board-8930: Use AUTO mode in PM8038 SMPS 3 sleep set configuration"
Conflicts:
	drivers/media/video/msm_wfd/mdp-4-subdev.c
Merge "msm: rpm: Correct MSM8930+PM8038 resource mapping"
Merge "defconfig: Updates for WLAN on the jb_2.5 branch"
msm: clock-8960: Disable hardware clock gating for vcap_ahb_clk

Hardware doesn't have the support on the auto gating of vcap_ahb_clk.
Therefore, disable this feature in this patch.

Change-Id: Id64f074f29593bfe0ea1fb1d2828b1f0699b5c47
Signed-off-by: Tianyi Gou <tgou@codeaurora.org>

Conflicts:
	arch/arm/mach-msm/clock-8960.c
mach-msm: Add support for APQ8064AA

Update all relevant cpu_is_apq8064xx() call-sites to add
APQ8064AA support.

Change-Id: I4d1f092f53f2f46e58b4a9a2758ef4ab7e78e1d3
Signed-off-by: Jay Chokshi <jchokshi@codeaurora.org>
Merge "msm: socinfo: Add support for APQ8064AA"
Conflicts:
	arch/arm/mach-msm/include/mach/socinfo.h
Merge "msm: clock-8960: Disable hardware clock gating for vcap_ahb_clk"
Conflicts:
	arch/arm/mach-msm/clock-8960.c
Merge "mach-msm: Add support for APQ8064AA"
Revert "msm: cache_erp: Handle recoverable L1 errors"

This reverts commit 06cc95a19302cfa2240a1d728493bd22dfe9a418.

Change-Id: I4bcc1d3b863637f98197e119d0dd0865f2e33d24
Signed-off-by: Sudhir Sharma <sudsha@codeaurora.org>