From: Linus Torvalds Date: Thu, 29 Oct 2009 16:16:23 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... X-Git-Tag: v2.6.32-rc6~38 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea38280c2a6e22997cf05bfea0d9391ddea1da24;p=pandora-kernel.git Merge branch 'for-linus' of git://git./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 --- ea38280c2a6e22997cf05bfea0d9391ddea1da24