]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Feb 2012 04:03:14 +0000 (20:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Feb 2012 04:03:14 +0000 (20:03 -0800)
commitb52b80023f262ce8a0ffdcb490acb23e8678377a
tree99b6ac984ea6812dbb70873c1dab04f44deab97b
parent16bca1d572930e5b91714d2c79ec986bc819e7a6
parent22c8bff6facebd6f1514ee1e37a6ffc892de7815
Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/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