John W. Linville 3b51cc996e Merge branch 'master' into for-davem ... Conflicts: drivers/net/wireless/ath/ath9k/phy.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-debugfs.c		2010-04-23 14:43:45 -04:00
..
aes_ccm.c	mac80211: aes_ccm.c remove crypto wrapper and extra args	2008-07-08 14:16:02 -04:00
aes_ccm.h	mac80211: pass scratch buffer directly, remove additional pointers	2008-07-08 14:16:02 -04:00
aes_cmac.c	mac80211: 802.11w - Add BIP (AES-128-CMAC)	2009-01-29 16:00:02 -05:00
aes_cmac.h	mac80211: 802.11w - Add BIP (AES-128-CMAC)	2009-01-29 16:00:02 -05:00
agg-rx.c	Merge branch 'master' into for-davem	2010-04-23 14:43:45 -04:00
agg-tx.c	Merge branch 'master' into for-davem	2010-04-23 14:43:45 -04:00
cfg.c	Merge branch 'master' into for-davem	2010-04-23 14:43:45 -04:00
cfg.h	[MAC80211]: rename ieee80211_cfg.h to cfg.h	2007-10-10 16:52:34 -07:00
debugfs_key.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_key.h	mac80211: 802.11w - Use BIP (AES-128-CMAC)	2009-01-29 16:00:03 -05:00
debugfs_netdev.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
debugfs_netdev.h	mac80211: reduce reliance on netdev	2009-12-21 18:38:52 -05:00
debugfs_sta.c	mac80211: fix typo for LDPC capability	2010-04-09 13:43:09 -04:00
debugfs_sta.h	mac80211: RCU-ify STA info structure access	2008-03-06 15:30:46 -05:00
debugfs.c	mac80211: Added a new debugfs file for reading channel_type	2010-02-08 16:50:57 -05:00
debugfs.h	cfg80211/mac80211: use debugfs_remove_recursive	2009-10-30 16:49:18 -04:00
driver-ops.h	Merge branch 'master' into for-davem	2010-04-23 14:43:45 -04:00
driver-trace.c	mac80211: fix sparse warnings/errors	2009-08-04 16:43:25 -04:00
driver-trace.h	mac80211: enhance tracing	2010-04-08 15:24:13 -04:00
event.c	cfg80211: use proper allocation flags	2009-07-10 15:01:49 -04:00
ht.c	mac80211: remove ieee80211_sta_stop_rx_ba_session	2010-04-07 14:38:03 -04:00
ibss.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
ieee80211_i.h	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
iface.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
Kconfig	mac80211: enhance tracing	2010-04-08 15:24:13 -04:00
key.c	Merge branch 'master' into for-davem	2010-04-23 14:43:45 -04:00
key.h	mac80211 : fix a race with update_tkip_key	2009-12-22 13:31:14 -05:00
led.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
led.h	mac80211: rename files	2008-04-08 16:44:45 -04:00
main.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
Makefile	mac80211: Generalize off-channel operation helpers from scan code	2009-12-28 16:55:01 -05:00
mesh_hwmp.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
mesh_pathtbl.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
mesh_plink.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
mesh.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
mesh.h	mac80211: Moved mesh action codes to a more visible location	2010-04-08 15:24:07 -04:00
michael.c	mac80211: remove ieee80211_get_hdr_info	2008-07-08 14:16:01 -04:00
michael.h	mac80211: remove ieee80211_get_hdr_info	2008-07-08 14:16:01 -04:00
mlme.c	Merge branch 'master' into for-davem	2010-04-23 14:43:45 -04:00
offchannel.c	mac80211: Fixed netif_tx_wake_all_queues in IBSS mode	2010-01-15 16:58:28 -05:00
pm.c	mac80211: rename WLAN_STA_SUSPEND to WLAN_STA_BLOCK_BA	2010-04-07 14:38:04 -04:00
rate.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
rate.h	mac80211: Fix HT rate control configuration	2010-03-03 15:39:21 -05:00
rc80211_minstrel_debugfs.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
rc80211_minstrel.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
rc80211_minstrel.h	minstrel: make the rate control ops reusable from another rc implementation	2010-03-10 17:44:23 -05:00
rc80211_pid_algo.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
rc80211_pid_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
rc80211_pid.h	mac80211/drivers: rewrite the rate control API	2008-10-31 19:00:23 -04:00
rx.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
scan.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
spectmgmt.c	mac80211: reduce reliance on netdev	2009-12-21 18:38:52 -05:00
sta_info.c	mac80211: Prevent running sta_cleanup timer unnecessarily	2010-04-19 16:41:42 -04:00
sta_info.h	mac80211: clean up/fix aggregation code	2010-04-07 14:38:05 -04:00
status.c	mac80211: optimize tx status processing	2010-03-15 15:31:59 -04:00
tkip.c	mac80211: pass vif and station to update_tkip_key	2010-01-22 16:08:55 -05:00
tkip.h	mac80211: tkip.c consolidate tkip IV writing in helper	2008-06-14 12:18:13 -04:00
tx.c	mac80211: Prevent running sta_cleanup timer unnecessarily	2010-04-19 16:41:42 -04:00
util.c	mac80211: enhance tracing	2010-04-08 15:24:13 -04:00
wep.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
wep.h	cfg80211: rework key operation	2009-07-24 15:05:09 -04:00
wme.c	mac80211: fix-up build breakage in 2.6.33	2010-01-06 15:35:49 -05:00
wme.h	mac80211: fix skb buffering issue	2010-01-05 16:21:40 -05:00
work.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
wpa.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
wpa.h	mac80211: 802.11w - Add BIP (AES-128-CMAC)	2009-01-29 16:00:02 -05:00