diff options
| author | David S. Miller <davem@davemloft.net> | 2016-06-15 21:37:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-15 21:37:10 -0700 |
| commit | 042ce7223095fc8950e769decc55f39fe85f87b1 (patch) | |
| tree | 74aba66f254ee8e1dc4655d8b8b39674a9b18a31 /include/net/ip_tunnels.h | |
| parent | a78c16e1b9ea74a64b356d667261a326fdc49513 (diff) | |
| parent | 7486216b3a0bd26375b17b2cc168a311106cea70 (diff) | |
Merge tag 'shared' of git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma
Mellanox shared code between RDMA and net-next trees
This is Mellanox mlx5_core shared code for both net-next and RDMA
trees for 4.8 kernel cycle.
Diffstat (limited to 'include/net/ip_tunnels.h')
0 files changed, 0 insertions, 0 deletions