From: David S. Miller <davem@davemloft.net>
Date: Mon, 4 May 2015 20:00:55 +0000 (-0400)
Subject: Merge tag 'mac80211-for-davem-2015-05-04' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: v4.14-rc1~5401^2~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b7ba7b469a4ffc2907c355a3c0873173567d9038;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'mac80211-for-davem-2015-05-04' of git://git./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>
---

b7ba7b469a4ffc2907c355a3c0873173567d9038