Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 12 Jun 2012 18:09:59 +0000 (14:09 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 12 Jun 2012 18:11:13 +0000 (14:11 -0400)
commita59f975a78f0606a3a364939dfa9b949d5f87521
tree42ef7708cdec5263026a5e1e84d960d6ba20844f
parent7f0d9f430dc99303558adc30a75eef10c43f7bec
parent6aee4ca3d2217d3f76469e5ed576d62695f0912a
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
MAINTAINERS
drivers/net/wireless/iwlwifi/pcie/trans.c
MAINTAINERS
drivers/net/wireless/iwlwifi/dvm/sta.c
drivers/net/wireless/iwlwifi/iwl-prph.h
drivers/net/wireless/iwlwifi/pcie/6000.c
drivers/net/wireless/iwlwifi/pcie/trans.c
net/mac80211/mlme.c
net/nfc/llcp/sock.c