From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 19 Jun 2013 16:55:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'mac80211/master' into HEAD
X-Git-Tag: v3.11-rc1~64^2~78^2^2~24^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f93beba705842af466e7c916b39630cacb40e9c6;p=pandora-kernel.git

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>
---

f93beba705842af466e7c916b39630cacb40e9c6
Reading git-diff-tree failed