Linux 3.4.83
prima: implement support for country code from SIM

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

Conflicts:

	drivers/staging/prima/CORE/HDD/src/wlan_hdd_assoc.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_main.c
prima: prevent crash on selecting only 2.4GHz bands

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

Conflicts:

	drivers/staging/prima/CORE/VOSS/src/vos_nvitem.c
prima: release v3.2.2.15

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

	42e214c Wlan: Release 3.2.2.15
	f67fdd9 WLAN: DUT sets NV default country code when disconnects from AP
	ca1762c Wlan: Release 3.2.2.14
	0ed4530 wlan: Aborting scan while disconnect is in progress.

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

Conflicts:

	drivers/staging/prima/CORE/HDD/src/wlan_hdd_assoc.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg80211.c
	drivers/staging/prima/CORE/MAC/inc/qwlan_version.h
prima: release v3.2.2.16

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

	dcac6a2 Wlan: Release 3.2.2.16
	4324e59 wlan: RX thread access HW register protection
	6032d59 wlan: wiphy->bands[] can be null.
	8f3ca34 wlan: probe request send on channel 12 13 14

Note that "6032d59 wlan: wiphy->bands[] can be null." is the official fix,
hence commit 8365076f1e6bf6d32f1574f493e70db860a5d372 has been
effectively reverted.

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

Conflicts:

	drivers/staging/prima/CORE/DXE/src/wlan_qct_dxe.c
	drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c
prima: release v3.2.2.17

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

	bfedb2b wlan: Release 3.2.2.17
	d82767d wlan: Fix for scan issue in 5 GHz band during regDomain Change
	5aa2b59 WLAN:11d,after few scans non-DFS channels converted to passive

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

Conflicts:

	drivers/staging/prima/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
	drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c
	drivers/staging/prima/CORE/VOSS/src/vos_nvitem.c
Compilation fixes
prima: correct definition of HDD_WAKE_LOCK_DURATION

This was meant to be 50ms, not 50 jiffies.

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

Conflicts:

	drivers/staging/prima/CORE/HDD/inc/wlan_hdd_main.h
prima: check for gCfgEntry being NULL

Signed-off-by: Iliyan Malchev <malchev@google.com>
Revert "prima: check for gCfgEntry being NULL"

This reverts commit 00ee50d1db501c496b726a45dcc58af3a04949d9.
Revert "prima: correct definition of HDD_WAKE_LOCK_DURATION"

This reverts commit 7bcb09a4d6588f6412e726f9d08717f3e10a1c1e.
Revert "Compilation fixes"

This reverts commit 1f4cca86786e005f3191d28d97ed978457227c73.
Revert "prima: release v3.2.2.17"

This reverts commit dbb54c72af25ea3d8ca69c190af071e2abc1b671.
Revert "prima: release v3.2.2.16"

This reverts commit 4e554a4a3860fc7496bb749224d319228a735be4.
Revert "prima: release v3.2.2.15"

This reverts commit 8ab66ef377b8b8abae296e9f8794d6b07cfd05c4.