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

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mthca: Free correct MPT on error exit from mthca_fmr_alloc()
  IPoIB/cm: Fix ipoib_cm_dev_stop() cleanup when drain times out

...

This commit is contained in:

Linus Torvalds 2008-02-19 15:50:11 -08:00

parent 37c514e3df b7f9c112a5

commit e855e5d82e

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

2

drivers/infiniband/hw/mthca/mthca_mr.c

View file

10

drivers/infiniband/ulp/ipoib/ipoib_cm.c

View file