Merge branch 'master' into for-davem
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 12 Apr 2012 18:25:14 +0000 (14:25 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 12 Apr 2012 18:41:59 +0000 (14:41 -0400)
commit7eab0f64a9eba5405222fdef0ede2468bf495efd
treeec99640b8d0b12adbfacb85c27683125debd14f2
parentcade455596504fae8e134a27189713ddf7c6d04d
parent8065248069097dddf9945acfb2081025e9618c16
Merge branch 'master' into for-davem

Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
net/wireless/nl80211.c
MAINTAINERS
drivers/net/wireless/ipw2x00/ipw2100.h
drivers/net/wireless/iwlwifi/iwl-testmode.c
drivers/net/wireless/mac80211_hwsim.c
net/wireless/nl80211.c
net/wireless/wext-core.c