Merge remote-tracking branch 'wireless-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Thu, 20 Feb 2014 10:55:12 +0000 (11:55 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 20 Feb 2014 10:55:12 +0000 (11:55 +0100)
1  2 
net/mac80211/cfg.c
net/mac80211/iface.c
net/wireless/nl80211.c

Simple merge
Simple merge
Simple merge