John W. Linville cc755896a4 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/ath/ar9170/main.c

2010-05-11 14:24:55 -04:00

..

aes_ccm.c

…

aes_ccm.h

…

aes_cmac.c

…

aes_cmac.h

…

agg-rx.c

Merge branch 'master' into for-davem

2010-04-23 14:43:45 -04:00

agg-tx.c

Merge branch 'wireless-2.6' into wireless-next-2.6

2010-04-30 15:13:00 -07:00

cfg.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2010-05-11 14:24:55 -04:00

cfg.h

…

chan.c

mac80211: improve HT channel handling

2010-05-07 14:55:51 -04: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

…

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: allow controlling aggregation manually

2010-05-03 14:53:10 -04:00

debugfs_sta.h

…

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' 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

driver-trace.c

…

driver-trace.h

mac80211: give virtual interface to hw_scan

2010-04-27 16:09:23 -04:00

event.c

…

ht.c

mac80211: remove ieee80211_sta_stop_rx_ba_session

2010-04-07 14:38:03 -04:00

ibss.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2010-05-11 14:24:55 -04: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-05-11 14:24:55 -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

…

main.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2010-05-11 14:24:55 -04:00

Makefile

cfg80211/mac80211: better channel handling

2010-05-07 14:55:50 -04: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

…

michael.h

…

mlme.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2010-05-11 14:24:55 -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

…

rx.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

scan.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

spectmgmt.c

mac80211: reduce reliance on netdev

2009-12-21 18:38:52 -05:00

sta_info.c

mac80211: fix ieee80211_find_sta[_by_hw]

2010-05-03 14:51:47 -04:00

sta_info.h

mac80211: clean up/fix aggregation code

2010-04-07 14:38:05 -04:00

status.c

mac80211: Fix sta->last_tx_rate setting with no-op rate control devices

2010-04-26 14:11:40 -04:00

tkip.c

mac80211: pass vif and station to update_tkip_key

2010-01-22 16:08:55 -05:00

tkip.h

…

tx.c

mac80211: set IEEE80211_TX_CTL_FIRST_FRAGMENT for beacons

2010-05-07 14:55:55 -04:00

util.c

mac80211: fix BSS info reconfiguration

2010-05-07 14:55:49 -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

…

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-05-05 16:14:16 -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

…