open-mpi/ompi-release — pull request #26 by alinask (2014-10-14 11:14:45+00:00)
Title: OSHMEM: fix the makefile.

(oshmem/mca/sshmem/base/Makefile.am)

(cherry picked from commit 1eb6286547780e965b8b933bd67b0c42d6969714)

Conflicts:
oshmem/mca/sshmem/base/Makefile.am

open-mpi/ompi@1eb6286547780e965b8b933bd67b0c42d6969714

@miked-mellanox @jladd-mlnx