]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'shared' of git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma
authorDavid S. Miller <davem@davemloft.net>
Thu, 16 Jun 2016 04:37:10 +0000 (21:37 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 16 Jun 2016 04:37:10 +0000 (21:37 -0700)
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.

1  2 
include/linux/mlx5/mlx5_ifc.h

Simple merge