diff options
author | David S. Miller <davem@davemloft.net> | 2020-01-15 23:04:04 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-01-15 23:04:04 +0100 |
commit | 8fec380ac0d4e57aaf0d475482b840a1f3e3e0f3 (patch) | |
tree | 335d1ccead6510f188bc638100486b3fa93b4463 /net/batman-adv/translation-table.h | |
parent | Merge branch 'bridge-add-vlan-notifications-and-rtm-support' (diff) | |
parent | batman-adv: Disable CONFIG_BATMAN_ADV_SYSFS by default (diff) | |
download | linux-dev-8fec380ac0d4e57aaf0d475482b840a1f3e3e0f3.tar.xz linux-dev-8fec380ac0d4e57aaf0d475482b840a1f3e3e0f3.zip |
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/translation-table.h')
-rw-r--r-- | net/batman-adv/translation-table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index 4a98860d7f0e..b24d35b9226a 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich, Antonio Quartulli */ |