Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Jan 2010 22:18:59 +0000 (17:18 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Jan 2010 22:18:59 +0000 (17:18 -0500)
commit4f9b2a7dea2bf1dd81f280aa5e8a40ed910d2f0a
tree52046049957a87103a383869155f43461963f089
parentf3f66b69c8ff08b46975d9e99c7ecb92a8b12eda
parent7a4a77b7771164d61ce702a588067d1e1d66db7c
Merge git://git./linux/kernel/git/linville/wireless-2.6

Conflicts:
net/mac80211/iface.c
13 files changed:
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/mwl8k.c
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt2x00.h
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00queue.c
drivers/net/wireless/zd1211rw/zd_mac.c
net/mac80211/iface.c
net/mac80211/rx.c
net/mac80211/tx.c
net/mac80211/util.c
net/wireless/reg.c