[libibverbs: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/libibverbs

[Doug Ledford]

commit 765a64832e3c58cc2171cd87a2593cf91b0502ef
Merge: f47793d fcef58b
Author: Doug Ledford <dledford at redhat.com>
Date:   Mon Jul 21 21:20:33 2014 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/libibverbs
    
    Conflicts:
    	libibverbs.spec

 libibverbs.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --cc libibverbs.spec
index 044fcc9,9d960e4..680202e
--- a/libibverbs.spec
+++ b/libibverbs.spec
@@@ -106,12 -100,8 +106,12 @@@ rm -rf %{buildroot
  %{_mandir}/man1/*
  
  %changelog
 +* Mon Jul 21 2014 Doug Ledford <dledford at redhat.com> - 1.1.8-1
 +- Update to new release
 +- Add patches for IP based RoCE GIDs
 +
- * Tue Feb 11 2014 Doug Ledford <dledford at redhat.com> - 1.1.7-5
- - Add XRC support from upstream git repo
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.7-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
  
  * Mon Jan 13 2014 Jon Stanley <jonstanley at gmail.com> - 1.1.7-4
  - Build without valgrind on ppc64le (1051633)