diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-12 04:27:19 +0200 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-12 04:27:19 +0200 |
commit | 39c853ebfe169f187a760b34f9cbf54751bfce00 (patch) | |
tree | 2a5a741d0cff7d4f90998b31b32ff80cfccd0369 /drivers/infiniband/hw/mlx5/user.h | |
parent | sg_start_req(): use import_iovec() (diff) | |
parent | new helper: msg_data_left() (diff) | |
download | linux-39c853ebfe169f187a760b34f9cbf54751bfce00.tar.xz linux-39c853ebfe169f187a760b34f9cbf54751bfce00.zip |
Merge branch 'for-davem' into for-next
Diffstat (limited to 'drivers/infiniband/hw/mlx5/user.h')
-rw-r--r-- | drivers/infiniband/hw/mlx5/user.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx5/user.h b/drivers/infiniband/hw/mlx5/user.h index d0ba264ac1ed..76fb7b927d37 100644 --- a/drivers/infiniband/hw/mlx5/user.h +++ b/drivers/infiniband/hw/mlx5/user.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 |