diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-10-27 13:38:15 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-10-27 13:38:15 -0400 |
| commit | 99c814066e75d09e6a38574c6c395f022a04b730 (patch) | |
| tree | f56d74a72e0c0d738c0096e4dfe310d27c42c39b /net/phonet/socket.c | |
| parent | fad1dbc8efb4e51e121c745a99c0fb22b420a5c6 (diff) | |
| parent | 11b2357d5dbce999803e9055f8c09829a8a87db4 (diff) | |
Merge tag 'mac80211-for-john-2014-10-23' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'net/phonet/socket.c')
0 files changed, 0 insertions, 0 deletions