From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 3 Jul 2007 04:05:35 +0000 (-0700)
Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
X-Git-Tag: v2.6.22~44
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52c4d73a6cca0db2927b60935e57429f98eae7c1;p=linux-2.6

Merge branch 'for-linus' of master.kernel.org:/pub/scm/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
---

52c4d73a6cca0db2927b60935e57429f98eae7c1