Merge tag 'mac80211-for-davem-2017-03-02' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Thu, 2 Mar 2017 22:39:17 +0000 (14:39 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 2 Mar 2017 22:39:17 +0000 (14:39 -0800)
Johannes Berg says:

====================
This contains just the average.h change in order to get it
into the tree before adding new users through -next trees.
====================

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

Trivial merge