From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 18 Dec 2012 08:25:10 +0000 (+0800)
Subject: Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0
X-Git-Tag: firefly_0821_release~8097
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2b57125c3dbc3aad4aded093868c196d8c86ac89;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0

Conflicts:
	drivers/net/wireless/bcmdhd/Makefile
	drivers/net/wireless/bcmdhd/bcmsdh.c
	drivers/net/wireless/bcmdhd/bcmsdh_linux.c
	drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
	drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_cfg80211.c
	drivers/net/wireless/bcmdhd/dhd_custom_gpio.c
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/dhd_sdio.c
	drivers/net/wireless/bcmdhd/include/bcmutils.h
	drivers/net/wireless/bcmdhd/include/epivers.h
	drivers/net/wireless/bcmdhd/include/sbchipc.h
	drivers/net/wireless/bcmdhd/include/sdioh.h
	drivers/net/wireless/bcmdhd/include/wlioctl.h
	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/wl_cfgp2p.h
	drivers/net/wireless/bcmdhd/wldev_common.c
---

2b57125c3dbc3aad4aded093868c196d8c86ac89
diff --cc include/net/cfg80211.h
index a2a97f34b9cb,748de7bc53cc..748de7bc53cc
mode 100755,100644..100755
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
diff --cc net/wireless/nl80211.c
index 743ce8c7a10f,752d5425adca..422e6032099b
mode 100755,100644..100755
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c