Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next

author Johannes Berg <johannes.berg@intel.com>

Tue, 11 Jun 2013 18:16:44 +0000 (20:16 +0200)

committer Johannes Berg <johannes.berg@intel.com>

Tue, 11 Jun 2013 18:16:44 +0000 (20:16 +0200)
author Johannes Berg <johannes.berg@intel.com>
Tue, 11 Jun 2013 18:16:44 +0000 (20:16 +0200)
committer Johannes Berg <johannes.berg@intel.com>
Tue, 11 Jun 2013 18:16:44 +0000 (20:16 +0200)
diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge
author	Johannes Berg <johannes.berg@intel.com>
	Tue, 11 Jun 2013 18:16:44 +0000 (20:16 +0200)
committer	Johannes Berg <johannes.berg@intel.com>
	Tue, 11 Jun 2013 18:16:44 +0000 (20:16 +0200)