From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 30 Oct 2012 08:09:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'wireless-next/master' into mac80211-next
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=6fb47de9cf1be4710fb9f364c500ff216fb47b34;p=linux-edison.git

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

6fb47de9cf1be4710fb9f364c500ff216fb47b34