tree 0f296f0b1e419eb4fc242e188376a4fdd80085fa
parent 52874a5e3917dde3b081521b014d6e4b226aacff
parent 3a5a423bb958ad22eeccca66c533e85bf69ba10e
author Johannes Berg <johannes.berg@intel.com> 1371660906 +0200
committer Johannes Berg <johannes.berg@intel.com> 1371660912 +0200

Merge remote-tracking branch 'mac80211/master' into HEAD

Merge mac80211 to avoid conflicts with the nl80211 attrbuf
changes.

Conflicts:
	net/mac80211/iface.c
	net/wireless/nl80211.c

Signed-off-by: Johannes Berg <johannes.berg@intel.com>