]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Jun 2013 02:56:30 +0000 (12:56 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Jun 2013 02:56:30 +0000 (12:56 +1000)
commitd25fb071690c30ba1174d321a16a256f5cc093b2
tree2dd789c4b1cee7522c981ddef5e004cca2af4ae3
parent7a75e56d9be8d019373863b216110c123207391f
parent99e94940697adec4f84758adb2db71f4a82c7ba5
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/ath/ath9k/Kconfig
drivers/net/wireless/ath/ath9k/debug.c
net/mac80211/iface.c
15 files changed:
MAINTAINERS
drivers/net/wireless/ath/ath9k/Kconfig
drivers/net/wireless/ath/ath9k/ar9003_phy.c
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/debug.c
drivers/net/wireless/ath/ath9k/debug.h
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/ath9k/mac.c
drivers/net/wireless/ath/ath9k/main.c
net/mac80211/ieee80211_i.h
net/mac80211/iface.c
net/mac80211/mlme.c
net/mac80211/util.c
net/wireless/core.c