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 /include/linux/mlx5/cmd.h | |
parent | Merge branch 'tipc-next' (diff) | |
parent | net/mlx5_core: Extend struct mlx5_interface to support multiple protocols (diff) | |
download | linux-dev-11a9c7821c583aa22b35f37fba20539def9e8f14.tar.xz linux-dev-11a9c7821c583aa22b35f37fba20539def9e8f14.zip |
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 'include/linux/mlx5/cmd.h')
-rw-r--r-- | include/linux/mlx5/cmd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mlx5/cmd.h b/include/linux/mlx5/cmd.h index 2826a4b6071e..68cd08f02c2f 100644 --- a/include/linux/mlx5/cmd.h +++ b/include/linux/mlx5/cmd.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Mellanox Technologies inc. All rights reserved. + * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU |