[Pkg-ofed-commits] [infinipath-psm] 11/11: Merge remote-tracking branch 'upstream/master'

[Ana Beatriz Guerrero López]

This is an automated email from the git hooks/post-receive script.

ana pushed a commit to branch master
in repository infinipath-psm.

commit 17e95b000b61077c44e999f4d3d33a1517ba4be1
Merge: 950e54a 4abbc60
Author: Ana Guerrero López <ana at ekaia.org>
Date:   Sun Apr 3 21:58:57 2016 +0200

    Merge remote-tracking branch 'upstream/master'

 .gitignore               | 6 ++++++
 psm.h                    | 2 +-
 psm_diags.c              | 2 +-
 psm_error.c              | 2 +-
 psm_mq.h                 | 2 +-
 ptl.h                    | 2 +-
 ptl_am/am_reqrep_shmem.c | 2 +-
 ptl_ips/ips_spio.c       | 2 +-
 8 files changed, 13 insertions(+), 7 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/infinipath-psm.git