Merge branches 'ipath' and 'ipoib' into for-linus

Browse source

...

This commit is contained in:

Roland Dreier 2008-08-19 15:01:45 -07:00

parent 24babadec0 a77a57a1a2

commit 45dd75d83c

2 changed files with 18 additions and 11 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

19

drivers/infiniband/ulp/ipoib/ipoib_main.c

View file

10

drivers/infiniband/ulp/ipoib/ipoib_multicast.c

View file