video: msm: properly ifdef for SII9234 HDMI out

Change-Id: I7ee815518f5bbc3165193881e1a28cfea4b34eb2

Conflicts:
	arch/arm/mach-msm/board-elite.c
msm8960: HTC: disable MHL

It currently interferes with cable detection in userspace.

Change-Id: I506a033b94dbbbbe6437bf74d1f8d637fd85f0b8

Conflicts:
	arch/arm/configs/elite_defconfig
	arch/arm/configs/ville_defconfig
msm8960: HTC: enable KSM and CPU alignment

Change-Id: Ib2728e1f0cdb57579d34c0000f844dfdee6b5b56

Conflicts:
	arch/arm/configs/elite_defconfig
	arch/arm/configs/ville_defconfig
msm8960: HTC: build modules into kernel where possible

Change-Id: I83d00ab73b0e8f9812ced76acfac413ae763a1cb

Conflicts:
	arch/arm/configs/elite_defconfig
	arch/arm/configs/ville_defconfig
vidc: 1080p: fix compiler warning about duplicated assignment

Conflicts:
	drivers/video/msm/vidc/common/vcd/vcd_sub.c
net: IPv4: revert HTC recording changes

Change-Id: I256f381b894972f3250e64a4dd1b88046eed9953

Conflicts:
	net/ipv4/af_inet.c
Kbuild: fix error for OS X kernel compilation

Change-Id: I3f81eeab054cc7641c235a3a3acc052c0a896b3b
msm: add extra cpu detection function stubs

Change-Id: I4b4c78a84ce04172a9dd305e1a3b45fdfd94feb2
msm8960: HTC: disable HTC perflock

Change-Id: I2ad06df39c2d3d839dfba8dc49503336df795b02

Conflicts:
	arch/arm/configs/elite_defconfig
	arch/arm/configs/ville_defconfig
nl80211: fix HT capability attribute validation

commit 6c7394197af90f6a332180e33f5d025d3037d883 upstream.

Since the NL80211_ATTR_HT_CAPABILITY attribute is
used as a struct, it needs a minimum, not maximum
length. Enforce that properly. Not doing so could
potentially lead to reading after the buffer.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
nl80211: advertise device AP SME

Add the ability to advertise that the device contains the AP SME and
what features it can support.There are currently no features in the
bitmap -- probe response offload will be advertised by a few patches
Arik is working on now (who took over from Guy Eilam) and a device
with AP SME will typically implement and require response offload.

Change-Id: Ic8d75e4933d795d43a0c30df6ec187f4d0ab6d8c
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>

Conflicts:
	include/linux/nl80211.h
nl80211: Add probe response offload attribute

Notify user-space about probe-response offloading support in the driver.
A wiphy flag is used to indicate support and a bitmap of protocols
determines which protocols are supported.

Change-Id: I13b16c71449ab61f4308b6caa1cca35529f905b4
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>