pop

diff --git a/meta b/meta
index a0f9400154b097685f19d6ca66f250cf00fc7b32..22fa93bf8c00924c3ada775bd5da5b573916ac42 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: dee353a66934929841e565e065d4f39950a30908
-Head: 79ecff9afd483c22821eca679e7ed668035ab4c1
+Previous: eb3a225b0265efe41b6ce2663aeade30c6335344
+Head: ed14c624d882d21df3e2d0c022cffab0b7f664b9
 Applied:
   sa_family: 79ecff9afd483c22821eca679e7ed668035ab4c1
+  af_ib: ed14c624d882d21df3e2d0c022cffab0b7f664b9
 Unapplied:
-  af_ib: d6ca81dc1b7923005309b04c3bb684da0361cbc9
   dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6

diff --git a/patches/af_ib b/patches/af_ib
index 96d860cd093bf4db308d9ccc25b5981aa598b523..50850586cce9d36cbf95a93c2f1a449046f0283e 100644 (file)
--- a/patches/af_ib
+++ b/patches/af_ib
@@ -1,5 +1,5 @@
-Bottom: a714bc4ff96a4b6832ac8f7cb9d7f0d37f8320e7
-Top:    887d55d9c4229530cb6672292eccba87095a9e52
+Bottom: 086badbbfd868932f3fafcd3ccbe5f43b1f494c0
+Top:    2e0a7d3ef44614a3f6760f3dad7fff7ae67386fc
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-17 14:02:45 -0700
 
@@ -129,7 +129,7 @@ index d96dbcd..92411fa 100755
  }
  
 diff --git a/src/cma.c b/src/cma.c
-index 5280620..2994655 100755
+index 4f6a5ab..f460967 100755
 --- a/src/cma.c
 +++ b/src/cma.c
 @@ -1,5 +1,5 @@