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)
commitbf5f48339a019c9b4b42284c3f45d58942cbda27
tree79976135166ffbdaf4ccb91bcadb17ddb551f060
parentd85dad75566674ca8012715ac00a84ced3697972
parent35582ad9d342025653aaf28ed321bf5352488d7f
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
net/mac80211/cfg.c
net/mac80211/iface.c
net/wireless/nl80211.c