The following commit has been merged in the linux branch: commit ea38280c2a6e22997cf05bfea0d9391ddea1da24 Merge: 61aa1620be20ddad75dde7882509bfe00148b8aa 06c3aa5ef1c9491f4c94483ca52afc420bc58c5a Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Oct 29 09:16:23 2009 -0700
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: mlx4_core: Add a new supported 40 GigE device ID