Merge branches 'ipoib', 'mad', 'mlx4', 'mthca' and 'nes' into for-linus

Browse source

...

This commit is contained in:

Roland Dreier 2009-09-24 12:43:08 -07:00

parent 5ee9512084 0e442afd92 c57e20dcff d686159e50 bdf643816a

commit 216c7f92b9

4 changed files with 26 additions and 8 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

17

drivers/infiniband/core/mad_rmpp.c

View file

11

drivers/infiniband/hw/mthca/mthca_catas.c

View file

1

drivers/infiniband/hw/nes/nes_nic.c

View file

5

drivers/net/mlx4/fw.c

View file