diff options
| author | David S. Miller <davem@davemloft.net> | 2020-01-16 01:04:04 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-16 01:04:04 +0300 |
| commit | 8fec380ac0d4e57aaf0d475482b840a1f3e3e0f3 (patch) | |
| tree | 335d1ccead6510f188bc638100486b3fa93b4463 /net/batman-adv/distributed-arp-table.h | |
| parent | 4e2fa6b902751da6e15ad1bc748a65498ed28c94 (diff) | |
| parent | b2e55ca89245fccd459a2d56850822a69a6f91da (diff) | |
| download | linux-8fec380ac0d4e57aaf0d475482b840a1f3e3e0f3.tar.xz | |
Merge tag 'batadv-next-for-davem-20200114' 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
- fix typo and kerneldocs, by Sven Eckelmann
- use WiFi txbitrate for B.A.T.M.A.N. V as fallback, by René Treffer
- silence some endian sparse warnings by adding annotations,
by Sven Eckelmann
- Update copyright years to 2020, by Sven Eckelmann
- Disable deprecated sysfs configuration by default, by Sven Eckelmann
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/distributed-arp-table.h')
| -rw-r--r-- | net/batman-adv/distributed-arp-table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h index 67c7729add55..2bff2f4a325c 100644 --- a/net/batman-adv/distributed-arp-table.h +++ b/net/batman-adv/distributed-arp-table.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2011-2019 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2020 B.A.T.M.A.N. contributors: * * Antonio Quartulli */ |