Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

Browse source

...

This commit is contained in:

Linus Torvalds 2005-08-04 09:20:23 -07:00

parent 6e346228c7 0dca0f7bf8

commit ea48e705be

2 changed files with 5 additions and 3 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

drivers/infiniband/include/ib_cm.h

View file

5

drivers/infiniband/ulp/ipoib/ipoib_main.c

View file