Merge branches 'cxgb4', 'ipoib' and 'mlx4' into for-next (d72623b6) · Commits · Martyn Welch / linux · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

d72623b6

Commit d72623b6 authored 12 years ago by Roland Dreier

Downloads
- Plain Diff

Merge branches 'cxgb4', 'ipoib' and 'mlx4' into for-next

parents 793dad94 b13912bb 3c439b55

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

drivers/infiniband/ulp/ipoib/ipoib_cm.c 3 additions, 0 deletions

drivers/infiniband/ulp/ipoib/ipoib_cm.c
drivers/infiniband/ulp/ipoib/ipoib_ib.c 2 additions, 1 deletion

drivers/infiniband/ulp/ipoib/ipoib_ib.c
drivers/net/ethernet/mellanox/mlx4/fw.c 12 additions, 3 deletions

drivers/net/ethernet/mellanox/mlx4/fw.c
drivers/net/ethernet/mellanox/mlx4/fw.h 1 addition, 0 deletions

drivers/net/ethernet/mellanox/mlx4/fw.h
drivers/net/ethernet/mellanox/mlx4/main.c 89 additions, 26 deletions

drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/ethernet/mellanox/mlx4/mcg.c 1 addition, 6 deletions

drivers/net/ethernet/mellanox/mlx4/mcg.c
drivers/net/ethernet/mellanox/mlx4/mlx4.h 4 additions, 2 deletions

drivers/net/ethernet/mellanox/mlx4/mlx4.h
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c 21 additions, 7 deletions

drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
include/linux/mlx4/device.h 1 addition, 0 deletions

include/linux/mlx4/device.h

with 134 additions and 45 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