Linus Torvalds b1cdc4670b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (63 commits) drivers/net/usb/asix.c: Fix pointer cast. be2net: Bug fix to avoid disabling bottom half during firmware upgrade. proc_dointvec: write a single value hso: add support for new products Phonet: fix potential use-after-free in pep_sock_close() ath9k: remove VEOL support for ad-hoc ath9k: change beacon allocation to prefer the first beacon slot sock.h: fix kernel-doc warning cls_cgroup: Fix build error when built-in macvlan: do proper cleanup in macvlan_common_newlink() V2 be2net: Bug fix in init code in probe net/dccp: expansion of error code size ath9k: Fix rx of mcast/bcast frames in PS mode with auto sleep wireless: fix sta_info.h kernel-doc warnings wireless: fix mac80211.h kernel-doc warnings iwlwifi: testing the wrong variable in iwl_add_bssid_station() ath9k_htc: rare leak in ath9k_hif_usb_alloc_tx_urbs() ath9k_htc: dereferencing before check in hif_usb_tx_cb() rt2x00: Fix rt2800usb TX descriptor writing. rt2x00: Fix failed SLEEP->AWAKE and AWAKE->SLEEP transitions. ...		2010-05-25 16:59:51 -07: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
debugfs_key.h
debugfs_netdev.c
debugfs_netdev.h
debugfs_sta.c	mac80211: allow controlling aggregation manually	2010-05-03 14:53:10 -04:00
debugfs_sta.h
debugfs.c
debugfs.h	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07: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-17 13:57:43 -04:00
driver-trace.c
driver-trace.h	mac80211: add offload channel switch support	2010-05-12 16:39:05 -04:00
event.c
ht.c
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-17 13:57:43 -04:00
iface.c
Kconfig
key.c	Revert "ath9k: Group Key fix for VAPs"	2010-05-24 14:59:27 -04:00
key.h
led.c
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	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00
mesh_pathtbl.c
mesh_plink.c
mesh.c	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00
mesh.h
michael.c
michael.h
mlme.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
offchannel.c
pm.c
rate.c
rate.h
rc80211_minstrel_debugfs.c
rc80211_minstrel.c
rc80211_minstrel.h
rc80211_pid_algo.c
rc80211_pid_debugfs.c
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-17 13:57:43 -04:00
scan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
spectmgmt.c
sta_info.c	kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN	2010-05-25 08:07:02 -07:00
sta_info.h	wireless: fix sta_info.h kernel-doc warnings	2010-05-24 15:07:43 -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
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
wep.h
wme.c
wme.h
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-17 13:57:43 -04:00
wpa.c
wpa.h