From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Tue, 22 Jul 2014 19:08:29 +0000 (+0300)
Subject: Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ae0008c71a192abe6f0fed7082d5e5b1cadfd4e7;p=linux.git

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

ae0008c71a192abe6f0fed7082d5e5b1cadfd4e7