prima: release v3.2.2.17b

	git://codeaurora.org/external/wlan/prima.git

	4990d1c Wlan: Release 3.2.2.17B
	d6b217f wlan: DTIM3 changed to DTIM1 after roaming
	f83a6cd Wlan: Release 3.2.2.17A
	2f45a43 Fix for "crash in pMac->cfg.gCfgEntry"
	c8faf30 wlan: Change regulatory followed customer request
	82e75bf wlan: Add msecs_to_jiffies() to wake lock argument
	f1bb518 Revert "wlan: Release 3.2.2.18"
	a65fc60 Revert "wlan: Set the country code in cfg before creating channel list."
	d235ff4 Revert "wlan: Release 3.2.2.19"
	2742bc2 Revert "wlan: Decrease SAP timeout from 100 to 10 seconds"
	768b6f5 Revert "wlan: Change RX wakelock to 50 milliseconds"
	4edbdc7 Revert "wlan: Fix for spectrum management bit in AddBss for SM disabled AP"
	2b46b25 Revert "wlan: Release 3.2.2.20"
	0647d89 wlan: Release 3.2.2.20
	e1c76a3 wlan: Fix for spectrum management bit in AddBss for SM disabled AP
	b8493a3 wlan: Change RX wakelock to 50 milliseconds
	476a501 wlan: Decrease SAP timeout from 100 to 10 seconds
	c883f13 wlan: Release 3.2.2.19
	4dbdab2 wlan: Set the country code in cfg before creating channel list.
	7cabdd8 wlan: Release 3.2.2.18

Signed-off-by: Iliyan Malchev <malchev@google.com>
prima: release v3.2.3.2

	git://codeaurora.org/external/wlan/prima.git

	893da90 wlan : Revision 3.2.3.2
	680abeb wlan: Enable TDLS for the drivers build as part of the kernel
	dd16d53 wlan: update sched_scan_results after cfg80211 resumed
	f6999ad wlan: Return success while stoping sched scan.
	969abac wlan: wiphy->bands[] can be null.
	e688ce3 wlan: GO should not follow STA channel if channel is passive.
	ae2bb79 wlan:Block WiFi Direct GO mode on UNII-1 Band.
	ab378f7 wlan: set appropriate flags for wiphy device based on current regdomain
	2692073 wlan: Revision 3.2.3.1
	f464d79 wlan: Update value of WLAN_HAL_PNO_MAX_NETW_CHANNELS
	fb72387 wlan: Update SME scan cache with PNO candidate information.
	da3fd7c wlan: Update definition of tPrefNetwFoundParams.
	571c5e9 Porting prima source from 2.6

Signed-off-by: Iliyan Malchev <malchev@google.com>

Conflicts:
	drivers/staging/prima/CORE/VOSS/src/vos_nvitem.c
        ...