From: David S. Miller <davem@davemloft.net>
Date: Sun, 31 May 2015 06:37:46 +0000 (-0700)
Subject: Merge tag 'mac80211-for-davem-2015-05-28' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: v4.1-rc7~26^2~12
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=50dce303d04617d5dbe98e513cb2b586fbf271a7;p=linux-2.6-block.git

Merge tag 'mac80211-for-davem-2015-05-28' of git://git./linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
This just has a single docbook build fix. In my confusion
I'd already sent the same fix for -next, but Ben Hutchings
noted it's necessary in 4.1.
====================

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

50dce303d04617d5dbe98e513cb2b586fbf271a7