| commit | d878fe2331219ff8518192b67f66699cb6d164e2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 14 18:37:09 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 14 18:37:09 2009 -0700 |
| tree | c3255588130a98256e56396c13c29e887fa1d6c1 | |
| parent | 62f49052ac4b68152ddf742b78b2151ba20dbc28 [diff] | |
| parent | 92bd3bbfbe644ea0860cfe84cf175fffa5246423 [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 new ConnectX EN PCI ID 0x6764 mlx4_core: Handle multi-physical function devices