Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Jul 2009 01:37:09 +0000 (18:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Jul 2009 01:37:09 +0000 (18:37 -0700)
commitd878fe2331219ff8518192b67f66699cb6d164e2
treec3255588130a98256e56396c13c29e887fa1d6c1
parent62f49052ac4b68152ddf742b78b2151ba20dbc28
parent92bd3bbfbe644ea0860cfe84cf175fffa5246423
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 new ConnectX EN PCI ID 0x6764
  mlx4_core: Handle multi-physical function devices