Merge branches 'cma' and 'mlx4' into for-next

Browse source

...

This commit is contained in:

Roland Dreier 2012-11-29 12:16:43 -08:00

parent d0951d2133 63f05be2c0 311f813a2d

commit 78c90247af

4 changed files with 17 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

drivers/infiniband/core/cma.c

View file

4

drivers/infiniband/hw/mlx4/cm.c

View file

9

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

View file

10

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

View file