android_kernel_xiaomi_sm8350/net/mac80211
David S. Miller 198d6ba4d7 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/isdn/i4l/isdn_net.c
	fs/cifs/connect.c
2008-11-18 23:38:23 -08:00
..
aes_ccm.c
aes_ccm.h
cfg.c mac80211: Allow AP mode to be enabled 2008-11-10 15:17:40 -05:00
cfg.h
debugfs_key.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
debugfs_key.h
debugfs_netdev.c mac80211: move bss_conf into vif 2008-10-31 19:00:15 -04:00
debugfs_netdev.h
debugfs_sta.c mac80211: fix a buffer overrun in station debug code 2008-11-10 21:37:39 -08:00
debugfs_sta.h
debugfs.c mac80211: make retry limits part of hw config 2008-10-31 19:00:14 -04:00
debugfs.h
event.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
ht.c mac80211: Add a new event in ieee80211_ampdu_mlme_action 2008-11-10 15:17:32 -05:00
ieee80211_i.h mac80211: remove SSID driver code 2008-11-10 15:11:56 -05:00
iface.c mac80211: move bss_conf into vif 2008-10-31 19:00:15 -04:00
Kconfig mac80211: add the 'minstrel' rate control algorithm 2008-10-06 18:14:57 -04:00
key.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
key.h
led.c
led.h
main.c mac80211: remove SSID driver code 2008-11-10 15:11:56 -05:00
Makefile mac80211: add the 'minstrel' rate control algorithm 2008-10-06 18:14:57 -04:00
mesh_hwmp.c mac80211/drivers: rewrite the rate control API 2008-10-31 19:00:23 -04:00
mesh_pathtbl.c mac80211: mesh portal functionality support 2008-09-24 16:18:02 -04:00
mesh_plink.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
mesh.c wireless: move mesh config length constant 2008-11-10 15:10:16 -05:00
mesh.h wireless: move mesh config length constant 2008-11-10 15:10:16 -05:00
michael.c
michael.h
mlme.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-11-18 23:38:23 -08:00
rate.c mac80211/drivers: rewrite the rate control API 2008-10-31 19:00:23 -04:00
rate.h mac80211: remove rate_control_clear 2008-10-31 19:00:37 -04:00
rc80211_minstrel_debugfs.c mac80211: correct warnings in minstrel rate control algorithm 2008-10-27 17:46:11 -04:00
rc80211_minstrel.c wireless: fix a few sparse warnings 2008-11-10 15:10:17 -05:00
rc80211_minstrel.h minstrel: improve performance for non-MRR drivers 2008-10-31 19:00:36 -04:00
rc80211_pid_algo.c mac80211: remove rate_control_clear 2008-10-31 19:00:37 -04:00
rc80211_pid_debugfs.c mac80211/drivers: rewrite the rate control API 2008-10-31 19:00:23 -04:00
rc80211_pid.h mac80211/drivers: rewrite the rate control API 2008-10-31 19:00:23 -04:00
rx.c mac80211: Re-enable aggregation 2008-10-31 19:02:14 -04:00
scan.c wireless: move mesh config length constant 2008-11-10 15:10:16 -05:00
spectmgmt.c mac80211: move frame TX function 2008-09-11 15:53:39 -04:00
sta_info.c mac80211: minor code cleanups 2008-10-31 18:05:59 -04:00
sta_info.h mac80211: fix two kernel-doc warnings 2008-10-31 19:02:36 -04:00
tkip.c mac80211: convert to %pM away from print_mac 2008-10-27 17:06:16 -07:00
tkip.h
tx.c wireless: fix a few sparse warnings 2008-11-10 15:10:17 -05:00
util.c mac80211: remove rate_control_clear 2008-10-31 19:00:37 -04:00
wep.c mac80211: minor code cleanups 2008-10-31 18:05:59 -04:00
wep.h mac80211: minor code cleanups 2008-10-31 18:05:59 -04:00
wext.c mac80211: remove SSID driver code 2008-11-10 15:11:56 -05:00
wme.c mac80211: Re-enable aggregation 2008-10-31 19:02:14 -04:00
wme.h mac80211: clean up some comments 2008-09-15 16:48:22 -04:00
wpa.c mac80211: minor code cleanups 2008-10-31 18:05:59 -04:00
wpa.h