Merge remote-tracking branch 'mac80211/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Fri, 24 May 2013 22:01:30 +0000 (00:01 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 24 May 2013 22:01:30 +0000 (00:01 +0200)
commitdde7dc759b777f385fc5df2af691c82eb455c7f3
tree5e8f1fcd10a6b264d60bc8a0503656c0611de222
parentb422c6cd7e93bb613030f14d7d8a0cc73f115629
parent4c8a9d4bfaf7dbc7d2168494904d79d22cc01db7
Merge remote-tracking branch 'mac80211/master' into mac80211-next
include/net/mac80211.h
net/mac80211/ieee80211_i.h
net/mac80211/mlme.c
net/mac80211/rx.c
net/mac80211/util.c
net/wireless/core.c
net/wireless/nl80211.c