From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Sun, 6 Jul 2014 08:15:30 +0000 (+0300)
Subject: Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6e55eed8f15484bb6504c2d54bf9283681f0ed9d;p=openwrt%2Fstaging%2Fblogic.git

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

6e55eed8f15484bb6504c2d54bf9283681f0ed9d