From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 18 Nov 2014 08:32:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'wireless-next/master' into mac80211-next
X-Git-Tag: v3.19-rc1~118^2~134^2~2^2~36
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=760a52e80fdf018a9f83a499427923e18e3bd582

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

This brings in some mwifiex changes that further patches will
need to work on top to not cause merge conflicts.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

760a52e80fdf018a9f83a499427923e18e3bd582