Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 8 Feb 2010 21:38:38 +0000 (16:38 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 8 Feb 2010 21:38:38 +0000 (16:38 -0500)
commit6e7e6213e4956828927c30e3ef5a42812d00c650
tree3e13859aae5ac0a50eecd452e96849e5e373f444
parent5ffaf8a361b4c9025963959a744f21d8173c7669
parentc0ce77b8323c1a0d4eeef97caf16c0ea971222a9
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6

Conflicts:
net/mac80211/scan.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/b43/b43.h
drivers/net/wireless/b43/main.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-sta.c
net/mac80211/driver-trace.h
net/mac80211/ibss.c
net/mac80211/scan.c