pyramid: build SPIDEV into kernel, not as a module
USB: gadget: import AOSP USB gadget

This brings USB gadget in line with AOSP USB gadget code in the
android-3.0 branch as of commit: usb: gadget: android Honor
CONFIG_USB_GADGET_VBUS_DRAW, 09701e3edf03f92f4215aad83b32cd8cec7fb689
pyramid: update aosp_pyramid_defconfig for bluetooth

Require BT_SCO, BT_RFCOMM, and HCIUART enabled in the kernel for
bluetooth functionality.
net: wireless: bcm4329: import AOSP bcm4329 driver

bcm4329 imported from android-3.0 at commit:
37ff4411a5f5ce21feb3825296308f2a767e3662, net: wireless: bcm4329: Fix
pno_enable if disassociated.
net: wireless: bcmdhd: import AOSP bcmdhd version

Import from AOSP kernel_common, branch android-3.0, as of commit:
net: wireless: bcmdhd: Update to Version 5.90.195.35,
4b04b815711fe48b87912e830cf330a84fefc329

Conflicts:

	drivers/net/wireless/bcmdhd/Kconfig
	drivers/net/wireless/bcmdhd/Makefile
wireless: Protect regdomain change by mutex

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
cfg80211/nl80211: Send AssocReq IEs to user space in AP mode

When user space SME/MLME (e.g., hostapd) is not used in AP mode, the
IEs from the (Re)Association Request frame that was processed in
firmware need to be made available for user space (e.g., RSN IE for
hostapd). Allow this to be done with cfg80211_new_sta().

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
nl80211/cfg80211: Make addition of new sinfo fields safer

Add a comment pointing out the use of enum station_info_flags for
all new struct station_info fields. In addition, memset the sinfo
buffer to zero before use on all paths in the current tree to avoid
leaving uninitialized pointers in the data.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
cfg80211: fix a crash in nl80211_send_station

mac80211 leaves sinfo->assoc_req_ies uninitialized, causing a random
pointer memory access in nl80211_send_station.
Instead of checking if the pointer is null, use sinfo->filled, like
the rest of the fields.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
pyramid: update aosp_pyramid_defconfig to use bcmdhd
pyramid: disable HTC perflocks in config
arm: Allow CPU-supported unaligned accesses

This change reconfigures the CPU to allow CPU-supported unaligned
accesses, which are generally faster than software-only fixups,
resulting in fewer alignment exceptions.

Signed-off-by: Brent DeGraaf <bdegraaf@codeaurora.org>

Conflicts:

	arch/arm/kernel/head.S
msm: qdsp6v2: Invalid memory access of timpani regset array

Adie codec write is accessing out of memory bound for
timpani regset array.

CRs-Fixed: 330562
Change-Id: I98f46d3b59c76ccfaf5edd6c04d1df01d431ef01
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
mfd: timpani-codec: Handle register write for numbers more than cached one

Add defense check for register write with numbers more than shadow cache.

CRs-Fixed: 312032
Change-Id: I2200b2fc8af32289e3a1a46f36756b909699c3a0
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
pyramid: update aosp_pyramid_defconfig
htc-battery-core: Fixing once again... (srsly htc? That was already there in 2.6.x)
base: genlock: Check for instances where handle is NULL

Check for the possibility of NULL handles passed into the
in-kernel API functions and return error where appropriate.
There is a non-zero chance that the private_data will be
cleared while the FD is still active, so check in the ioctl()
function as well.

(cherry picked from commit a73ed097420c53451e843ae61d9aadc8fefabc94)

Change-Id: If481b98a6a2ab01ab788c23bffe9df7ab8bc6aee
CRs-fixed: 332835
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
base: genlock: Remove genlock_release_lock and associated ioctl

Allowing a lock to be asynchronously released while a handle
was still active turned out to be too dangerous to use in a
multi-threaded environment and it served no pratical
purpose anyway.  Handles now hold an attached lock until they
are destroyed.

(cherry picked from commit 4df70a254d9ddea0ee4bede39d4d12e6360e5b99)

Change-Id: I969ac3cf84c5982cc7c03c5651c7fe328567c02b
CRs-fixed: 333141
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>

Conflicts:

	Documentation/genlock.txt
base: genlock: Use a signed long for the result from wait_timeout

interruptible_wait_timeout returns a signed long, so make sure that
we use a signed long to hold the result. Using an unsigned value would
horribly misinterpet an error such as -ERESTARTSYS.

CRs-Fixed: 341347
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
(cherry picked from commit be669bc92358653a46c63f2352e6d981f9ed3bdf)

Change-Id: Ifcf555f8719f9c74fdb6d8b5cf2a32582988335b
Signed-off-by: Ram Kumar Chakravarthy Chebathini <rcheba@codeaurora.org>

Conflicts:

	drivers/base/genlock.c
gpu: ion: Add ION Memory Manager

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>

Conflicts:

	drivers/gpu/Makefile
	drivers/gpu/ion/Kconfig
	drivers/gpu/ion/Makefile
	drivers/video/Kconfig
	include/linux/ion.h

Conflicts:

	drivers/gpu/Makefile