From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Tue, 6 May 2014 17:37:42 +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=cebeb0f1885fa93c44be5d4e0b9b640210ff088c;p=openwrt%2Fstaging%2Fblogic.git

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

cebeb0f1885fa93c44be5d4e0b9b640210ff088c