Merge branches 'cxgb4', 'mlx4' and 'ocrdma' into for-linus (20952cdd) · Commits · Clea OS / bsp / nxp / linux-seco-imx · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

linux-seco-imx
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Jira
- Terraform modules
- Model experiments

Snippets Groups Projects

20952cdd

Commit 20952cdd authored 12 years ago by Roland Dreier

Downloads
- Plain Diff

Merge branches 'cxgb4', 'mlx4' and 'ocrdma' into for-linus

parents 71b43fd5 fc2d0044 7ad5e449

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

drivers/infiniband/hw/mlx4/main.c 8 additions, 13 deletions

drivers/infiniband/hw/mlx4/main.c
drivers/infiniband/hw/mlx4/mlx4_ib.h 8 additions, 0 deletions

drivers/infiniband/hw/mlx4/mlx4_ib.h
drivers/infiniband/hw/mlx4/qp.c 15 additions, 6 deletions

drivers/infiniband/hw/mlx4/qp.c
drivers/infiniband/hw/ocrdma/ocrdma.h 0 additions, 1 deletion

drivers/infiniband/hw/ocrdma/ocrdma.h
drivers/infiniband/hw/ocrdma/ocrdma_abi.h 1 addition, 4 deletions

drivers/infiniband/hw/ocrdma/ocrdma_abi.h
drivers/infiniband/hw/ocrdma/ocrdma_hw.c 1 addition, 8 deletions

drivers/infiniband/hw/ocrdma/ocrdma_hw.c
drivers/infiniband/hw/ocrdma/ocrdma_main.c 0 additions, 1 deletion

drivers/infiniband/hw/ocrdma/ocrdma_main.c
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c 0 additions, 5 deletions

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
drivers/infiniband/hw/ocrdma/ocrdma_verbs.h 0 additions, 1 deletion

drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
drivers/net/ethernet/mellanox/mlx4/port.c 2 additions, 2 deletions

drivers/net/ethernet/mellanox/mlx4/port.c

with 35 additions and 41 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment