From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 3 Jan 2013 12:01:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'mac80211/master' into HEAD
X-Git-Tag: v3.9-rc1~139^2~242^2^2~165
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=694c61863286e963e90c75e701a0f79039da865d;p=pandora-kernel.git

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

694c61863286e963e90c75e701a0f79039da865d