diff options
| author | David S. Miller <davem@davemloft.net> | 2016-05-04 23:21:08 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-04 23:21:08 +0300 |
| commit | 5332174a83720921a5ef6db8080a8691f7ccbc27 (patch) | |
| tree | c1dca18d5f12429dd911677855e0a773b56e85a9 /MAINTAINERS | |
| parent | e98a3aabf85f60b80c6ef93e509d38144ca434b1 (diff) | |
| parent | 64ae74455371a40bc9f9c8325eb4c37f2978c95f (diff) | |
| download | linux-5332174a83720921a5ef6db8080a8691f7ccbc27.tar.xz | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Antonio Quartulli says:
====================
pull request: batman-adv 20160504
In this pull request you have:
- two changes to the MAINTAINERS file where one marks our mailing list
as moderated and the other adds a missing documentation file
- kernel-doc fixes
- code refactoring and various cleanups
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 867d6be32cc8..2b74fde7bcc2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2203,10 +2203,13 @@ BATMAN ADVANCED M: Marek Lindner <mareklindner@neomailbox.ch> M: Simon Wunderlich <sw@simonwunderlich.de> M: Antonio Quartulli <a@unstable.cc> -L: b.a.t.m.a.n@lists.open-mesh.org +L: b.a.t.m.a.n@lists.open-mesh.org (moderated for non-subscribers) W: https://www.open-mesh.org/ 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: net/batman-adv/ BAYCOM/HDLCDRV DRIVERS FOR AX.25 |