diff options
| author | David S. Miller | 2015-05-30 23:37:46 -0700 |
|---|---|---|
| committer | David S. Miller | 2015-05-30 23:37:46 -0700 |
| commit | 50dce303d04617d5dbe98e513cb2b586fbf271a7 (patch) | |
| tree | eb1d928c2c1e3cbf45fd920b50036cecb24bd450 /include/net/sock.h | |
| parent | 71d9f6149cac8fc6646adfb2a6f3b0de6ddd23f6 (diff) | |
| parent | 3a7af58faa7829faa26026c245d2a8a44e9605c5 (diff) | |
Merge tag 'mac80211-for-davem-2015-05-28' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'include/net/sock.h')
0 files changed, 0 insertions, 0 deletions