fbe644ea0860cfe84cf175fffa5246423
author Linus Torvalds <torvalds@linux-foundation.org> 1247621829 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1247621829 -0700

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
«µ·¤˜