Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Jan 2011 21:23:14 +0000 (16:23 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Jan 2011 21:23:14 +0000 (16:23 -0500)
commit3e11210d46a4f252f41db6e442b46026aeddbb59
treeb258375de649a5e04e8d567c850b47c41f8ceb11
parent3bf63e59e577cbecd41334c866f501c4cc5d54c5
parentc7c1806098752c1f46943d8db2c69aff07f5d4bc
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6

Conflicts:
drivers/net/wireless/ath/ath9k/init.c
15 files changed:
MAINTAINERS
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath9k/ar9002_calib.c
drivers/net/wireless/ath/ath9k/htc.h
drivers/net/wireless/ath/ath9k/htc_drv_init.c
drivers/net/wireless/ath/ath9k/htc_drv_main.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/hw.h
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/iwlwifi/iwl-4965.c
net/mac80211/agg-rx.c
net/mac80211/main.c
net/mac80211/tx.c