From: David S. Miller <davem@davemloft.net>
Date: Tue, 6 Jan 2015 18:29:27 +0000 (-0500)
Subject: Merge tag 'mac80211-for-davem-2015-01-06' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: v3.19-rc4~27^2~3
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=15ecf7a063fcc11caa3281076d63d515f1f9a951

Merge tag 'mac80211-for-davem-2015-01-06' of git://git./linux/kernel/git/jberg/mac80211

Here's just a single fix - a revert of a patch that broke the
p54 and cw2100 drivers (arguably due to bad assumptions there.)
Since this affects kernels since 3.17, I decided to revert for
now and we'll revisit this optimisation properly for -next.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

15ecf7a063fcc11caa3281076d63d515f1f9a951