From: Emmanuel Grumbach Date: Sun, 6 Jul 2014 08:15:30 +0000 (+0300) Subject: Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next X-Git-Tag: v3.17-rc1~106^2~210^2~46 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6e55eed8f15484bb6504c2d54bf9283681f0ed9d;p=users%2Fjedix%2Flinux-maple.git Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next --- 6e55eed8f15484bb6504c2d54bf9283681f0ed9d