Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 15 Feb 2012 21:24:37 +0000 (16:24 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 15 Feb 2012 21:24:37 +0000 (16:24 -0500)
commitca994a36f585432458ead9133fcfe05440edbb7b
treebe05512153a9cd5cbe1f1234bc09fd9cd388ec58
parent12325280dfeba18164f9c47e226a40ab34e23ee7
parent2504a6423b9ab4c36df78227055995644de19edb
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
net/mac80211/debugfs_sta.c
net/mac80211/sta_info.h
12 files changed:
MAINTAINERS
drivers/bcma/main.c
drivers/bcma/scan.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/init.c
drivers/net/wireless/mwifiex/main.c
drivers/net/wireless/rt2x00/rt2800lib.c
net/mac80211/main.c
net/mac80211/rx.c