| commit | ea38280c2a6e22997cf05bfea0d9391ddea1da24 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 29 09:16:23 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 29 09:16:23 2009 -0700 |
| tree | 9537bdf89da38177566c913833b1e917cf8c525a | |
| parent | 61aa1620be20ddad75dde7882509bfe00148b8aa [diff] | |
| parent | 06c3aa5ef1c9491f4c94483ca52afc420bc58c5a [diff] |
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