From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Jul 2009 01:37:09 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: v2.6.31-rc4~50
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d878fe2331219ff8518192b67f66699cb6d164e2;p=karo-tx-linux.git

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
---

d878fe2331219ff8518192b67f66699cb6d164e2