Merge remote-tracking branch 'wireless-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Mon, 16 Dec 2013 10:23:45 +0000 (11:23 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 16 Dec 2013 10:23:45 +0000 (11:23 +0100)
commitc4de673b775e4db48cd2db6277e0c6714332ca0c
tree84f9e4728e6ccf257236d2ba063b6e784ec8b65d
parentbafdc614a1f4f8be8cde41b8ab10ac17e67c1837
parent55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
drivers/net/wireless/mwifiex/cfg80211.c
net/mac80211/cfg.c
net/mac80211/ibss.c
net/mac80211/iface.c
net/mac80211/rx.c
net/mac80211/scan.c
net/mac80211/trace.h
net/mac80211/util.c
net/wireless/core.c
net/wireless/core.h
net/wireless/nl80211.c