kernel_optimize_test/net/wireless
David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/sfc/sfe4001.c
	drivers/net/wireless/libertas/cmd.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/rtl8187se/Kconfig
	drivers/staging/rtl8192e/Kconfig
2009-11-18 22:19:03 -08:00
..
chan.c cfg80211: fix locking for SIWFREQ 2009-08-14 09:13:51 -04:00
core.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
core.h cfg80211/mac80211: use debugfs_remove_recursive 2009-10-30 16:49:18 -04:00
debugfs.c cfg80211/mac80211: use debugfs_remove_recursive 2009-10-30 16:49:18 -04:00
debugfs.h cfg80211/mac80211: use debugfs_remove_recursive 2009-10-30 16:49:18 -04:00
ethtool.c cfg80211: add firmware and hardware version to wiphy 2009-10-07 16:39:46 -04:00
ethtool.h net/wireless/ethtool.h: drop unnecessary include of linux/ethtool.h 2009-10-07 16:39:49 -04:00
ibss.c wext: refactor 2009-10-07 16:39:43 -04:00
Kconfig wext: refactor 2009-10-07 16:39:43 -04:00
lib80211_crypt_ccmp.c lib80211: silence excessive crypto debugging messages 2009-03-16 18:01:58 -04:00
lib80211_crypt_tkip.c lib80211: silence excessive crypto debugging messages 2009-03-16 18:01:58 -04:00
lib80211_crypt_wep.c
lib80211.c
Makefile wireless: implement basic ethtool support for cfg80211 devices 2009-10-07 16:39:45 -04:00
mlme.c cfg80211: remove dead variable 2009-11-04 18:44:48 -05:00
nl80211.c nl80211: only allow adding stations to running vlan interfaces 2009-11-13 17:43:59 -05:00
nl80211.h cfg80211: fix locking 2009-07-10 15:02:32 -04:00
radiotap.c
reg.c trivial: remove duplicate "different" from comment 2009-08-14 09:14:02 -04:00
reg.h Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-08-12 17:44:53 -07:00
scan.c cfg80211: validate scan channels 2009-11-02 15:43:29 -05:00
sme.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-06 00:55:55 -08:00
sysfs.c cfg80211: rename cfg80211_registered_device's idx to wiphy_idx 2009-02-27 14:52:54 -05:00
sysfs.h
util.c mac80211: implement support for 4-address frames for AP and client mode 2009-11-11 17:02:10 -05:00
wext-compat.c cfg80211: Fix WEXT compat siwauth wpa and group cipher 2009-11-02 15:43:24 -05:00
wext-compat.h cfg80211: validate channel settings across interfaces 2009-08-14 09:13:42 -04:00
wext-core.c wext: refactor 2009-10-07 16:39:43 -04:00
wext-priv.c wext: refactor 2009-10-07 16:39:43 -04:00
wext-proc.c wext: refactor 2009-10-07 16:39:43 -04:00
wext-sme.c cfg80211: don't set privacy w/o key 2009-09-28 16:55:04 -04:00
wext-spy.c wext: refactor 2009-10-07 16:39:43 -04:00