diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-22 09:36:37 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-22 09:36:37 -0500 |
| commit | 291040cd7e8368a38ae6624f457c39827c55c7f8 (patch) | |
| tree | 1c2f9a6cc47711884913dd420fa42d15efb6ccaf /crypto/gcm.c | |
| parent | b75703de16301b80f1eedecafdf37bb02c9e155f (diff) | |
| parent | 0ddcff49b672239dda94d70d0fcf50317a9f4b51 (diff) | |
| download | linux-291040cd7e8368a38ae6624f457c39827c55c7f8.tar.gz linux-291040cd7e8368a38ae6624f457c39827c55c7f8.tar.bz2 linux-291040cd7e8368a38ae6624f457c39827c55c7f8.zip | |
Merge tag 'mac80211-next-for-davem-2018-01-22' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Less than a handful of changes:
* possible memory leak fix in hwsim
* speed up hwsim
* add hwsim userspace rate control API
* code cleanups
====================
A conflict was resolved in mac80211_hwsim.c, mostly of
the simple overlapping changes category. One adding
a rhashtable and another adding a workqueue.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto/gcm.c')
0 files changed, 0 insertions, 0 deletions