Merge branches 'misc', 'mlx4' and 'nes' into for-next

Browse source

...

This commit is contained in:

Roland Dreier 2010-12-01 16:33:47 -08:00

parent 91a4d157d0 21d606090e e3d33cb132

commit 7adce751ce

4 changed files with 12 additions and 9 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

3

MAINTAINERS

View file

4

drivers/infiniband/hw/mlx4/main.c

View file

10

drivers/infiniband/hw/mlx4/qp.c

View file

4

drivers/net/mlx4/fw.c

View file