From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 15 Feb 2013 08:41:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'mac80211/master' into HEAD
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=8cdc196b743c4224ffa59fef38133559c1fd2a5e;p=linux-edison.git

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

8cdc196b743c4224ffa59fef38133559c1fd2a5e