From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 27 Oct 2014 17:38:15 +0000 (-0400)
Subject: Merge tag 'mac80211-for-john-2014-10-23' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.18-rc3~17^2^2~8
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=99c814066e75d09e6a38574c6c395f022a04b730;p=linux-2.6-block.git

Merge tag 'mac80211-for-john-2014-10-23' of git://git./linux/kernel/git/jberg/mac80211

Johannes Berg <johannes@sipsolutions.net> says:

"Here are a few fixes for the wireless stack: one fixes the
RTS rate, one for a debugfs file, one to return the correct
channel to userspace, a sanity check for a userspace value
and the remaining two are just documentation fixes."

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

99c814066e75d09e6a38574c6c395f022a04b730