John W. Linville 7eab0f64a9 Merge branch 'master' into for-davem ...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-testmode.c
	net/wireless/nl80211.c

2012-04-12 14:41:59 -04:00

..

.gitignore

…

chan.c

nl80211: Parse channel type attribute in an ibss join request

2011-12-06 16:05:24 -05:00

core.c

cfg80211/mac80211: enable proper device_set_wakeup_enable handling

2012-04-11 16:23:57 -04:00

core.h

cfg80211: export cfg80211_ref_bss

2012-02-06 14:50:37 -05:00

db.txt

…

debugfs.c

simple_open: automatically convert to simple_open()

2012-04-05 15:25:50 -07:00

debugfs.h

…

ethtool.c

…

ethtool.h

…

genregdb.awk

cfg80211: relicense reg.c reg.h and genregdb.awk to ISC

2012-01-04 14:30:41 -05:00

ibss.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

Kconfig

wireless: disable wext sysfs by default

2011-12-07 15:19:39 -05:00

lib80211_crypt_ccmp.c

wireless: Remove unnecessary OOM logging messages

2011-09-13 15:45:02 -04:00

lib80211_crypt_tkip.c

wireless: Remove unnecessary OOM logging messages

2011-09-13 15:45:02 -04:00

lib80211_crypt_wep.c

wireless: Remove unnecessary OOM logging messages

2011-09-13 15:45:02 -04:00

lib80211.c

…

Makefile

…

mesh.c

{nl,cfg}80211: Support for mesh synchronization

2012-04-10 15:20:33 -04:00

mlme.c

cfg80211: add channel switch notify event

2012-04-11 16:23:59 -04:00

nl80211.c

Merge branch 'master' into for-davem

2012-04-12 14:41:59 -04:00

nl80211.h

cfg80211: add channel switch notify event

2012-04-11 16:23:59 -04:00

radiotap.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

reg.c

cfg80211: warn if db.txt is empty with CONFIG_CFG80211_INTERNAL_REGDB

2012-04-09 16:37:11 -04:00

reg.h

cfg80211: relicense reg.c reg.h and genregdb.awk to ISC

2012-01-04 14:30:41 -05:00

regdb.h

cfg80211: relicense reg.c reg.h and genregdb.awk to ISC

2012-01-04 14:30:41 -05:00

scan.c

cfg80211: use compare_ether_addr on MAC addresses instead of memcmp

2012-04-09 16:09:35 -04:00

sme.c

cfg80211: stop tracking authenticated state

2012-02-06 14:50:37 -05:00

sysfs.c

…

sysfs.h

…

util.c

cfg80211: expose cfg80211_calculate_bitrate()

2012-03-06 15:16:17 -05:00

wext-compat.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

wext-compat.h

…

wext-core.c

Merge branch 'master' into for-davem

2012-04-12 14:41:59 -04:00

wext-priv.c

…

wext-proc.c

…

wext-sme.c

cfg80211: Add background scan period attribute.

2012-03-12 14:19:34 -04:00

wext-spy.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00