Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
commit52c4d73a6cca0db2927b60935e57429f98eae7c1
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 3 Jul 2007 04:05:35 +0000 (2 21:05 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 3 Jul 2007 04:05:35 +0000 (2 21:05 -0700)
tree2edd0d21e25ca0b044ba2e14425ccc21e07909f8
parentca9c5ffd9d12e136f72fa52840cda83485d586cd
parent841adfca9c5fc0fec6b1f0b2e5eb7a3b239a7730
Merge branch 'for-linus' of /linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IPoIB/cm: Partial error clean up unmaps wrong address
  mlx4_core: Add new Mellanox device IDs