diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2019-07-10 16:51:35 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2019-07-10 16:51:35 +0300 |
| commit | 88c90e800675b98008d5ebe5e81245910417a22d (patch) | |
| tree | eb06c935cc3363a284382fce1f6721f3a862654e /include/net/tc_act/tc_tunnel_key.h | |
| parent | caceff96d5b7b487da19c0916e0048ff8f1709a9 (diff) | |
| parent | 4cf643a39221af24a151ad2cff4e3f95f12f368e (diff) | |
| download | linux-88c90e800675b98008d5ebe5e81245910417a22d.tar.xz | |
Merge drm/drm-next into drm-intel-next-queued
Catch-up with 5.2. Specially to remove a drm-tip merge
fixup around intel_workarounds.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/net/tc_act/tc_tunnel_key.h')
| -rw-r--r-- | include/net/tc_act/tc_tunnel_key.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/net/tc_act/tc_tunnel_key.h b/include/net/tc_act/tc_tunnel_key.h index 23d5b8b19f3e..7c3f777c168c 100644 --- a/include/net/tc_act/tc_tunnel_key.h +++ b/include/net/tc_act/tc_tunnel_key.h @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016, Amir Vadai <amir@vadai.me> * Copyright (c) 2016, Mellanox Technologies. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #ifndef __NET_TC_TUNNEL_KEY_H |