John W. Linville 83163244f8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem ... Conflicts: drivers/net/wireless/libertas_tf/cmd.c drivers/net/wireless/libertas_tf/main.c		2010-05-05 16:14:16 -04:00
..
.gitignore	wireless: support internal statically compiled regulatory database	2009-12-21 18:56:10 -05:00
chan.c	cfg80211: add remain-on-channel command	2009-12-28 16:55:02 -05:00
core.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2010-05-05 16:14:16 -04:00
core.h	cfg80211: Add local-state-change-only auth/deauth/disassoc	2010-04-07 14:37:56 -04:00
db.txt	wireless: support internal statically compiled regulatory database	2009-12-21 18:56:10 -05:00
debugfs.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09: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
genregdb.awk	wireless: fix comments in genregdb.awk	2009-12-25 16:35:43 -08:00
ibss.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
Kconfig	wireless: remove CONFIG_WIRELESS_OLD_REGULATORY	2009-12-28 16:31:37 -05:00
lib80211_crypt_ccmp.c	lib80211: Cosmetics - make room for MIC/CRC near the actual calculation	2010-02-02 16:03:38 -05:00
lib80211_crypt_tkip.c	lib80211: Introduce TKIP_HDR_LEN define for code clarity	2010-02-02 16:03:38 -05:00
lib80211_crypt_wep.c	lib80211: absorb crypto bits from net/ieee80211	2008-11-21 11:08:17 -05:00
lib80211.c	lib80211: consolidate crypt init routines	2008-11-21 11:08:17 -05:00
Makefile	wireless: support internal statically compiled regulatory database	2009-12-21 18:56:10 -05:00
mlme.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2010-04-15 16:21:34 -04:00
nl80211.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2010-05-05 16:14:16 -04:00
nl80211.h	cfg80211: Add connection quality monitoring support to nl80211	2010-03-24 16:02:37 -04:00
radiotap.c	wireless: update radiotap parser	2010-02-08 16:50:53 -05:00
reg.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2010-04-15 16:21:34 -04:00
reg.h	cfg80211: add regulatory hint disconnect support	2010-02-01 15:40:06 -05:00
regdb.h	wireless: support internal statically compiled regulatory database	2009-12-21 18:56:10 -05:00
scan.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
sme.c	Merge branch 'master' into for-davem	2010-04-23 14:43:45 -04:00
sysfs.c	cfg80211: export multiple MAC addresses in sysfs	2010-01-22 16:11:16 -05:00
sysfs.h
util.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2010-04-15 16:21:34 -04:00
wext-compat.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
wext-compat.h	cfg80211: validate channel settings across interfaces	2009-08-14 09:13:42 -04:00
wext-core.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
wext-priv.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
wext-proc.c	net: spread __net_init, __net_exit	2010-01-17 19:16:02 -08:00
wext-sme.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
wext-spy.c	wext: refactor	2009-10-07 16:39:43 -04:00