defconfig: don't build as modules
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>
nl80211/cfg80211: add max_sched_scan_ssids in the hw description

Some chips can scan more SSIDs with a single scheduled scan command
than with a single normal scan command (eg. wl12xx chips).

To support this, this patch creates a separate hardware description
element that describes the amount of SSIDs supported in scheduled
scans.

Signed-off-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Conflicts:

	include/linux/nl80211.h
nl80211/cfg80211: add max_sched_scan_ie_len in the hw description

Some chips may support different lengths of user-supplied IEs with a
single scheduled scan command than with a single normal scan command.

To support this, this patch creates a separate hardware description
element that describes the maximum size of user-supplied information
element data supported in scheduled scans.

Signed-off-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
nl80211/cfg80211: add match filtering for sched_scan

Introduce filtering for scheduled scans to reduce the number of
unnecessary results (which cause useless wake-ups).

Add a new nested attribute where sets of parameters to be matched can
be passed when starting a scheduled scan.  Only scan results that
match any of the sets will be returned.

At this point, the set consists of a single parameter, an SSID.  This
can be easily extended in the future to support more complex matches.

Signed-off-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Conflicts:

	include/linux/nl80211.h
	net/wireless/nl80211.c
pyramid: update aosp_pyramid_defconfig to use bcmdhd

Conflicts:

	arch/arm/configs/aosp_pyramid_defconfig
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
msm: kgsl: move msm_adreno220 files back to drivers/gpu/msm

HTC distinguish drivers/gpu/msm by using separate directories,
unfortunately this makes it annoying to merge changes from CAF. Move the
msm_adreno220 directory files back into its original location.
pyramid: update aosp_pyramid_defconfig for msm kgsl move
Fix OMX venc

Why did HTC change this?
Merge branch 'faux123' of https://github.com/vorbeth/htc-kernel-msm8660.git into exp

Conflicts:
	arch/arm/configs/faux_msm8660_defconfig
	build-pyramid
	releasetools/META-INF/com/google/android/updater-script

Signed-off-by: Matt Filetto <matt.filetto@gmail.com>
Merge branch 'faux123' of https://github.com/vorbeth/htc-kernel-msm8660.git into Faux123-v001-AOSP-ICS
Merge pull request #2 from Albinoman887/Faux123-v001-AOSP-ICS

Faux123 v001 aosp ics - adds AOSP USB and fixes omx for camcorder