Merge branch 'android-exynos-3.4-SEC' into perseus

Conflicts:
	arch/arm/mach-exynos/Kconfig
	arch/arm/mach-exynos/board-universal5410-battery.c
	drivers/battery/max77803_charger.c
	drivers/cpufreq/exynos-ikcs-cpufreq.c
	drivers/hid/hid-ids.h
	drivers/media/video/exynos/fimg2d/fimg2d.h
	drivers/net/wireless/bcmdhd/Kconfig
	drivers/net/wireless/bcmdhd/Makefile
	drivers/net/wireless/bcmdhd/aiutils.c
	drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
	drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c
	drivers/net/wireless/bcmdhd/bcmutils.c
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_cdc.c
	drivers/net/wireless/bcmdhd/dhd_common.c
	drivers/net/wireless/bcmdhd/dhd_custom_gpio.c
	drivers/net/wireless/bcmdhd/dhd_custom_sec.c
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/dhd_sdio.c
	drivers/net/wireless/bcmdhd/dhd_sec_feature.h
	drivers/net/wireless/bcmdhd/include/bcmdefs.h
	drivers/net/wireless/bcmdhd/include/bcmsdh_sdmmc.h
	drivers/net/wireless/bcmdhd/include/bcmutils.h
	drivers/net/wireless/bcmdhd/include/epivers.h
	drivers/net/wireless/bcmdhd/include/linux_osl.h
	drivers/net/wireless/bcmdhd/include/linuxver.h
	drivers/net/wireless/bcmdhd/linux_osl.c
	drivers/net/wireless/bcmdhd/wl_android.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.h
	drivers/net/wireless/bcmdhd/wl_cfgp2p.c

drivers/net/wireless/bcmdhd/Kconfig

@@ -19,6 +19,13 @@ config BCM4335
 	  This module adds support for wireless adapters based on
 	  Broadcom 4335 chipset.
 
+config BCM4339
+	tristate "Broadcom 4339 wireless cards support"
+	depends on WLAN
+	---help---
+	  This module adds support for wireless adapters based on
+	  Broadcom 4339 chipset.
+
 config BCM43241
 	tristate "Broadcom 43241 wireless cards support"
 	depends on WLAN
@@ -71,7 +78,7 @@ config DHD_USE_SCHED_SCAN
 
 config BROADCOM_WIFI_RESERVED_MEM
 	bool "BROADCOM Reserved memory for wifi device"
-	depends on (BCM4330 || BCM4334 || BCM4335 || BCM43241)
+	depends on (BCM4330 || BCM4334 || BCM4335 || BCM4339 || BCM43241)
 	---help---
 	  This is a configuration for broadcom WLAN driver.
 
@@ -82,9 +89,15 @@ config BCM4335BT
 	---help---
 	  This is a configuration for bt lock enable.
 
+config WIFI_BROADCOM_COB
+	bool "BROADCOM COB type chip is enabled"
+	depends on (BCM4330 || BCM4334 || BCM4335 || BCM4339 || BCM43241)
+	---help---
+	  This is a configuration for COB type feature.
+
 config WLAN_REGION_CODE
 	int "---Region codes for Broadcom WiFi Driver"
-	depends on (BCM4330 || BCM4334 || BCM4335 || BCM43241)
+	depends on (BCM4330 || BCM4334 || BCM4335 || BCM4339 || BCM43241)
 	default 100
 	---help---
 		This is a region code for Broadcom Wi-Fi featured functions.
@@ -95,3 +108,23 @@ config WLAN_REGION_CODE
 		- 202 : KOR KTT
 		- 203 : KOR LGT
 		- 300 : CHN OPEN
+		- 400 : USA OPEN
+		- 401 : USA ATT
+		- 402 : USA TMO
+		- 403 : USA VZW
+		- 404 : USA SPR
+		- 405 : USA USC
+
+config WIFI_2GHZ_VHT_NO_SUPPORT
+	bool "BROADCOM Reserved memory for wifi device"
+	depends on BCM4339
+	default n
+	---help---
+	  This is a configuration for 2GHZ VHT mode.
+
+config WLAIBSS
+	bool "Advanced IBSS mode"
+	depends on (BCM4335 || BCM4339)
+	default y
+	---help---
+	  This is a configuration for Oxygen Network.