diff options
| author | David S. Miller <davem@davemloft.net> | 2015-04-02 16:33:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-02 16:33:43 -0400 |
| commit | 11a9c7821c583aa22b35f37fba20539def9e8f14 (patch) | |
| tree | 6b1186f8509add5e36e87122813b53c86ab6987a /net/ipv4/xfrm4_input.c | |
| parent | c448b5e7853b5921957c4cbf5ad54a20eff79882 (diff) | |
| parent | 64613d9499c4887485d4350387919ea507330d90 (diff) | |
Merge branch 'mlx5-next'
Eli Cohen says:
====================
mlx5 batch of patches for net-next
This series contains small fixes to the mlx5 core driver and also
preparation steps towards adding Ethernet support for ConnectX4
devices which will be part of mlx5 driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_input.c')
0 files changed, 0 insertions, 0 deletions