From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 6 Sep 2012 15:05:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'wireless-next/master' into mac80211-next
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=00b14825eead7dd748d15ce6519726d06b3ee0d5;p=linux-edison.git

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

00b14825eead7dd748d15ce6519726d06b3ee0d5