黄涛 2b57125c3d 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

2012-12-18 16:25:10 +08:00

..

.gitignore

wireless: support internal statically compiled regulatory database

2009-12-21 18:56:10 -05:00

chan.c

cfg80211: fix can_beacon_sec_chan, reenable HT40

2010-11-18 11:35:05 -05:00

core.c

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

2012-12-18 16:25:10 +08:00

core.h

Revert "Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0"

2012-12-18 16:23:28 +08:00

db.txt

wireless: support internal statically compiled regulatory database

2009-12-21 18:56:10 -05:00

debugfs.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

debugfs.h

cfg80211/mac80211: use debugfs_remove_recursive

2009-10-30 16:49:18 -04:00

ethtool.c

wireless: add support for ethtool_ops->{get,set}_ringparam

2011-03-11 14:16:58 -05:00

ethtool.h

net/wireless/ethtool.h: drop unnecessary include of linux/ethtool.h

2009-10-07 16:39:49 -04:00

genregdb.awk

wireless: correct sparse warning in generated regdb.c

2010-07-20 16:49:37 -04:00

ibss.c

cfg80211/mac80211: allow per-station GTKs

2010-10-06 16:30:40 -04:00

Kconfig

net: wireless: Add CFG80211_ALLOW_RECONNECT option

2011-09-15 09:25:48 -07:00

lib80211_crypt_ccmp.c

lib80211: remove unused host_build_iv option

2010-07-26 15:09:04 -04:00

lib80211_crypt_tkip.c

net/wireless: Use pr_<level> and netdev_<level>

2010-11-24 16:19:33 -05:00

lib80211_crypt_wep.c

wireless: Fix warnings due to -Wunused-but-set-variable

2011-05-10 15:53:47 -04:00

lib80211.c

net/wireless: Use pr_<level> and netdev_<level>

2010-11-24 16:19:33 -05:00

Makefile

cfg80211/mac80211: add mesh join/leave commands

2010-12-06 16:01:29 -05:00

mesh.c

nl80211: New notification to discover mesh peer candidates.

2011-04-12 16:57:39 -04:00

mlme.c

Revert "Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0"

2012-12-18 16:23:28 +08:00

nl80211.c

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

2012-12-18 16:25:10 +08:00

nl80211.h

Revert "Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0"

2012-12-18 16:23:28 +08:00

radiotap.c

radiotap: fix vendor namespace parsing

2010-10-15 15:57:34 -04:00

reg.c

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

2012-12-01 12:07:55 +08:00

reg.h

net/wireless: add COUNTRY to to regulatory device uevent

2011-03-09 16:10:57 -05:00

regdb.h

wireless: support internal statically compiled regulatory database

2009-12-21 18:56:10 -05:00

scan.c

net: wireless: change the expire time about each entry of scan results

2011-09-09 12:27:06 -07:00

sme.c

net: wireless: Skip connect warning for CONFIG_CFG80211_ALLOW_RECONNECT

2011-10-28 10:35:37 -07:00

sysfs.c

nl80211/cfg80211: WoWLAN support

2011-05-05 14:59:19 -04:00

sysfs.h

[WIRELESS] cfg80211: New wireless config infrastructure.

2007-04-25 22:29:41 -07:00

util.c

wireless: drop invalid mesh address extension frames

2012-11-17 13:14:20 -08:00

wext-compat.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-03-03 21:27:42 -08:00

wext-compat.h

cfg80211: validate channel settings across interfaces

2009-08-14 09:13:42 -04:00

wext-core.c

net/wireless: Use pr_<level> and netdev_<level>

2010-11-24 16:19:33 -05:00

wext-priv.c

wext: fix potential private ioctl memory content leak

2010-09-20 13:41:40 -04:00

wext-proc.c

net: spread __net_init, __net_exit

2010-01-17 19:16:02 -08:00

wext-sme.c

cfg80211: allow changing port control protocol

2010-08-27 13:27:07 -04:00

wext-spy.c

wext: refactor

2009-10-07 16:39:43 -04:00