Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Oct 2009 16:16:23 +0000 (09:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Oct 2009 16:16:23 +0000 (09:16 -0700)
commitea38280c2a6e22997cf05bfea0d9391ddea1da24
tree9537bdf89da38177566c913833b1e917cf8c525a
parent61aa1620be20ddad75dde7882509bfe00148b8aa
parent06c3aa5ef1c9491f4c94483ca52afc420bc58c5a
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