From 2446f543c363afbd820cde354b36d8622cbc5cd1 Mon Sep 17 00:00:00 2001
From: Tim Mattox <tmattox@gmail.com>
Date: Tue, 27 May 2008 18:28:38 +0000
Subject: [PATCH] Resync the trunk NEWS file with the 1.2.x NEWS file.

This commit was SVN r18511.
---
 NEWS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NEWS b/NEWS
index 4b447d2e0e..9f988c2b62 100644
--- a/NEWS
+++ b/NEWS
@@ -95,6 +95,9 @@ Trunk (not on release branches yet)
 1.2.7 (might never be released)
 -----
 
+- Added vendor IDs for some ConnectX openib HCAs. See ticket #1311.
+- Fix some RPM specfile inconsistencies.  See ticket #1308.
+  Thanks to Jim Kusznir for noticing the problem.
 - Removed an unused function prototype that caused warnings on
   some systems (e.g., OS X).  See ticket #1274.
 - Fix a deadlock in inter-communicator scatter/gather operations.