diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-02-01 11:04:13 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-01 11:04:13 -0800 |
| commit | d3a5fd3c987c5e341bf78b79ef4d81080081b7d2 (patch) | |
| tree | c3031332ea46d593fc5121679094c9873eda5ca7 /include/uapi/linux | |
| parent | Merge tag 'mac80211-next-for-davem-2019-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next (diff) | |
| parent | batman-adv: Update copyright years for 2019 (diff) | |
| download | linux-dev-d3a5fd3c987c5e341bf78b79ef4d81080081b7d2.tar.xz linux-dev-d3a5fd3c987c5e341bf78b79ef4d81080081b7d2.zip | |
Merge tag 'batadv-next-for-davem-20190201' 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
- Add DHCPACKs for DAT snooping, by Linus Luessing
- Update copyright years for 2019, by Sven Eckelmann
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/batadv_packet.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/batman_adv.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/batadv_packet.h b/include/uapi/linux/batadv_packet.h index 894d8d2f713d..7eb2936a8e22 100644 --- a/include/uapi/linux/batadv_packet.h +++ b/include/uapi/linux/batadv_packet.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */ -/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h index 324a0e1143e7..a28e76a7e0a2 100644 --- a/include/uapi/linux/batman_adv.h +++ b/include/uapi/linux/batman_adv.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: MIT */ -/* Copyright (C) 2016-2018 B.A.T.M.A.N. contributors: +/* Copyright (C) 2016-2019 B.A.T.M.A.N. contributors: * * Matthias Schiffer * |