]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 01:41:39 +0000 (11:41 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 01:41:39 +0000 (11:41 +1000)
commit47b469053a1650220fe69e82e9ff0591febcd993
tree1e6fb2cbefeb00c0ff077fc3f165affd79ce9cfc
parent4eb9246f264283a8e21b57c4b958ec8b45d32a98
parent1f807827869fd5992738633832309d6a4bdd0c0c
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/ethernet/broadcom/Kconfig
21 files changed:
MAINTAINERS
drivers/net/ethernet/broadcom/Kconfig
drivers/net/wireless/iwlegacy/4965-mac.c
drivers/net/wireless/iwlwifi/mvm/d3.c
drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/scan.c
drivers/net/wireless/iwlwifi/mvm/sta.c
drivers/net/wireless/iwlwifi/pcie/drv.c
drivers/net/wireless/iwlwifi/pcie/rx.c
drivers/net/wireless/iwlwifi/pcie/trans.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/cfp.c
drivers/net/wireless/mwifiex/join.c
drivers/net/wireless/mwifiex/sdio.c
drivers/net/wireless/mwifiex/sta_ioctl.c
include/net/cfg80211.h
include/net/mac80211.h
net/mac80211/mlme.c
net/wireless/core.c
net/wireless/nl80211.c