Merge "mac80211: VHT (11ac) association"
Conflicts:
	net/mac80211/mlme.c
Merge "ieee80211: Rename VHT cap struct"
Merge "{nl,cfg}80211: Peer STA VHT caps"
Conflicts:
	include/linux/nl80211.h
	net/wireless/nl80211.c
Merge "cfg80211: Pass station (extended) capability info to kernel"
Conflicts:
	net/wireless/nl80211.c
Merge "cfg80211: Pass TDLS peer's QoS/HT/VHT information during set_station"
Conflicts:
	net/wireless/nl80211.c
Merge "cfg80211: fix station change if TDLS isn't supported"
Merge "msm: camera: Add support for diverting RDI frames."
msm:rq_stats: Add hotplug disable attribute

Register for suspend and resume notifications from kernel. This should
be done as part of core_initcall so as to receive notification as close
as possible to the actual event. Add hotplug_disable attribute to
rq-stats node. Set/clear this attribute based on the suspend/resume events.

CRS-fixed: 452456
Change-Id: I76fee349b57f47df40785e9c2503e2e1cc6e064e
Signed-off-by: Archana Sathyakumar <asathyak@codeaurora.org>
msm: pm-8x60: Setup memory for save/restore cpu registers early

Cores can be offlined early in the boot cycle by certain kernel
drivers.
Ensure that the memory to save and restore the cpu registers is
ready and available early during the boot procedure.

CRs-Fixed: 460083
Change-Id: I925372f066386ceb1e85184d4c58863835c3e88e
Signed-off-by: Praveen Chidambaram <pchidamb@codeaurora.org>
msm: board-8064: Initialize SPM driver earlier than thermal

Thermal driver needs to be able to do core control and force cores to
be offline during certain thermal conditions. SPM driver is needed for
cores to do power collapse.

CRs-Fixed: 460083
Change-Id: Id64fe7529438aad68a515c19317db2b95b8b9b65
Signed-off-by: Praveen Chidambaram <pchidamb@codeaurora.org>
msm: pm-data: Enable powercollapse/suspend_enabled for non-boot cpus

Allow non-boot cpus to be hotplugged and power collapsed by default.
This facilitates the cores to be offlined by kernel drivers during the
boot process.

CRs-Fixed: 460083
Change-Id: If44b6b594504dab61dff662c581b60e6fb664936
Signed-off-by: Praveen Chidambaram <pchidamb@codeaurora.org>
thermal: msm: Add core control support to thermal driver

Detect and limit the numbers used during boot up if the core
temperatures are already higher than the control threshold.

CRs-Fixed: 460083
Change-Id: I2ad4b6d1b6834fa610a95d53b420e914054aa66a
Signed-off-by: Praveen Chidambaram <pchidamb@codeaurora.org>
msm: board-8064: Add core control limits for msm_thermal

Specify core control limits (temperature, hysterisis and the allowed
cpus) to handle thermal conditions at boot and offline the cores when
thermal limits are crossed.

CRs-Fixed: 460083
Change-Id: Ie96a783dbdbf537c5ff9c5e8b7118ffc6053e10f
Signed-off-by: Praveen Chidambaram <pchidamb@codeaurora.org>
msm: mdm: Fix error value for SHUTDOWN_CHARM ioctl

SHUTDOWN_CHARM should write the error value to the parameter
passed, but in this case as no error value is updated.

(cherry picked from commit d1ed37b3fff7e67c933868f6dd263624c8d91e22)
CRs-Fixed: 424291
Change-Id: I00bb4e1c955687cea9f3fc185888adfbbb8e1fc9
Signed-off-by: Taniya Das <tdas@codeaurora.org>