From: Sean Hefty <sean.hefty@intel.com>
Date: Fri, 28 Jun 2013 17:53:52 +0000 (-0700)
Subject: pop
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=50790bec2209d8b9f22555860b6995be95cfb820;p=~shefty%2Fibacm.git

pop
---

diff --git a/meta b/meta
index 83cc14a..0acbfff 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 54b8f645742278769aef617f48e6c8fa0a460045
-Head: 90ac3a19740070583d60687b12bebe98743d130a
+Previous: fde03aa81d8c3f195ca9cd92a9cc5653e7ee572f
+Head: 4cdfa0bd31da50a9033f66550cfc070f47eeef8d
 Applied:
   rmcfg: 977896dc127018271adae25f7d637e098bad33d5
   acm_notes-txt-change-dos-forma: b07f140dd83b881c922f4c6b70cfa7145727044f
@@ -13,8 +13,8 @@ Applied:
   ib_acme-c-support-ipv6-address: b67a388af31aae17da603dc123c255dfad647a95
   convert-linux-header-files-fro: 4561ebcdfee763675be6ac832befa738848c0fe7
   add-support-for-preloading-ipv: 90ac3a19740070583d60687b12bebe98743d130a
+  add-option-to-allow-for-acm-ca: 4cdfa0bd31da50a9033f66550cfc070f47eeef8d
 Unapplied:
-  add-option-to-allow-for-acm-ca: d48bf7533f06420e121f57d95d73687e442343b9
   notes-fmt: 988d784b42cdb9db05b1608a5cdb29c51215bd9e
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a
diff --git a/patches/add-option-to-allow-for-acm-ca b/patches/add-option-to-allow-for-acm-ca
index 43bbd45..d013203 100644
--- a/patches/add-option-to-allow-for-acm-ca
+++ b/patches/add-option-to-allow-for-acm-ca
@@ -1,5 +1,5 @@
-Bottom: ec5db008b112f21c867c8dc375025a4564a55607
-Top:    71e98c2c941c4d549159b0fc2ac67ce8b001dc3e
+Bottom: b61bf4078da248149352b1220735ba9935dbf52b
+Top:    395b549366db321ef91ef6ea74a60d114c3c6bde
 Author: Hal Rosenstock <hal@mellanox.com>
 Date:   2013-06-21 03:29:03 +0300