]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 19 Jan 2010 20:58:41 +0000 (15:58 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 19 Jan 2010 20:58:41 +0000 (15:58 -0500)
commit031cf0e94c9c8302a4592707939d6c2039f17f28
tree02f3f0d3f89f03217bdb83530af30a95c9ab6191
parent730dd70549e0ec755dd55615ba5cfc38a482a947
parentad580db50ee8dccd069ffcd76d6f70fa6d4a62a8
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
13 files changed:
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-devtrace.c
drivers/net/wireless/iwlwifi/iwl-devtrace.h
drivers/net/wireless/zd1211rw/zd_usb.c
net/mac80211/cfg.c
net/mac80211/iface.c
net/mac80211/mlme.c
net/mac80211/rx.c
net/wireless/core.c
net/wireless/sme.c