| commit | e855e5d82edd708bcb966cf7ccda2dee1c154935 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Feb 19 15:50:11 2008 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Feb 19 15:50:11 2008 -0800 |
| tree | a0efdf7a61329b2bae35e0ee61a94afe5f1eeeb2 | |
| parent | 37c514e3dfc8f55145d9c6895e2838ac31859aa4 [diff] | |
| parent | b7f9c112a5e7f68d77a31c79f5942a3272ae9a3b [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * '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