| commit | 15ecf7a063fcc11caa3281076d63d515f1f9a951 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Jan 06 13:29:27 2015 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Tue Jan 06 13:29:27 2015 -0500 |
| tree | 3bca92021502058095c5dfeee9b956069e53723a | |
| parent | a5e31255e02a0797259f210c3bb92c6326a98a9c [diff] | |
| parent | 1e359a5de861a57aa04d92bb620f52a5c1d7f8b1 [diff] |
Merge tag 'mac80211-for-davem-2015-01-06' of git://git.kernel.org/pub/scm/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>