diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-04 22:00:55 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-04 22:00:55 +0200 |
| commit | b7ba7b469a4ffc2907c355a3c0873173567d9038 (patch) | |
| tree | b7fdeccae8bea26bbdaff824cfa75407f49fa9dc /arch/c6x | |
| parent | bnx2x: Fix to prevent inner-reload (diff) | |
| parent | mac80211: fix 90 kernel-doc warnings (diff) | |
| download | linux-b7ba7b469a4ffc2907c355a3c0873173567d9038.tar.xz linux-b7ba7b469a4ffc2907c355a3c0873173567d9038.zip | |
Merge tag 'mac80211-for-davem-2015-05-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
We have only a few fixes right now:
* a fix for an issue with hash collision handling in the
rhashtable conversion
* a merge issue - rhashtable removed default shrinking
just before mac80211 was converted, so enable it now
* remove an invalid WARN that can trigger with legitimate
userspace behaviour
* add a struct member missing from kernel-doc that caused
a lot of warnings
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/c6x')
0 files changed, 0 insertions, 0 deletions