diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-03 09:24:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-03 09:24:06 -0700 |
| commit | f6c00a3bb85671ccc71650c0f13871f318d7d74c (patch) | |
| tree | 6a3e1fe14dd2c48c94063dc1462602e69da296cf /MAINTAINERS | |
| parent | b8c17f7088310e7ee34ca61929f737045adfd449 (diff) | |
| parent | e45eba2467bd64fd196dc6f8b50ff5e59c0058da (diff) | |
| download | linux-f6c00a3bb85671ccc71650c0f13871f318d7d74c.tar.gz linux-f6c00a3bb85671ccc71650c0f13871f318d7d74c.tar.bz2 linux-f6c00a3bb85671ccc71650c0f13871f318d7d74c.zip | |
Merge tag 'batadv-next-for-davem-20170802' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This feature/cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Remove unnecessary length qualifier, by Joe Perches
- Remove too short %pM field width, by Sven Eckelmann
- Remove return value handling from skb_put_data, by Sven Eckelmann
- Spelling fixes, by Colin Ian King
- Convert batman-adv.txt to reStructuredText, by Sven Eckelmann
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 448f2f67802f..c67618c97c5d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2477,7 +2477,7 @@ Q: https://patchwork.open-mesh.org/project/batman/list/ S: Maintained F: Documentation/ABI/testing/sysfs-class-net-batman-adv F: Documentation/ABI/testing/sysfs-class-net-mesh -F: Documentation/networking/batman-adv.txt +F: Documentation/networking/batman-adv.rst F: include/uapi/linux/batman_adv.h F: net/batman-adv/ |