From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Feb 2012 04:03:14 +0000 (-0800)
Subject: Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=b52b80023f262ce8a0ffdcb490acb23e8678377a;p=linux-edison.git

Merge tag 'rdma-for-linus' of git://git./linux/kernel/git/roland/infiniband

One InfiniBand/RDMA regression fix for 3.3:

 - mlx4 SR-IOV changes added static exported functions, which doesn't
   build on powerpc at least.  Fix from Doug Ledford for this.

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  mlx4_core: Exported functions can't be static
---

b52b80023f262ce8a0ffdcb490acb23e8678377a