From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Sun, 23 Nov 2014 17:56:35 +0000 (+0200)
Subject: Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=aeb8f932080d62cdc305a7ccca9d60de34908b30;p=linux.git

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

aeb8f932080d62cdc305a7ccca9d60de34908b30