pop

diff --git a/meta b/meta
index f976bc81e2d8915cbba8b03048a2d657240ef961..d4468ee6d5afd875f4d4d3c2825133fff3a4a53b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: d9289470c3bb875660a00cb9416c79064cc09424
-Head: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
+Previous: 9ef6e320c8759f17a5e6f26bd19c2837daa09228
+Head: b131326fd7cad28cd3b9a3d09c29c9476d7fddb0
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
+  fork: b131326fd7cad28cd3b9a3d09c29c9476d7fddb0
 Unapplied:
-  fork: a70ee35a8dfd07cca88c8b3b6fa6308bd0d3e3d0
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
 Hidden:

diff --git a/patches/fork b/patches/fork
index b3343777c42ea77a5f2d85532c58955d91e25a24..564e103ad34b0830dd2a68fdfa1e72a384a36d0c 100644 (file)
--- a/patches/fork
+++ b/patches/fork
@@ -1,5 +1,5 @@
-Bottom: 5fd229f7e20bde0c0ed3050847f79e5d4c8af2b1
-Top:    704e50345b9783ecab92b6e8a634edd31c1342f6
+Bottom: c0306f4628b14e75db3da212b4a99875f49be65f
+Top:    3ef5d9a598c00e66ce2beafac99c914e0942c3c3
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-13 15:25:53 -0700
 
@@ -14,7 +14,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 8f281d3..fee191b 100644
+index d2058e2..5860a4c 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -46,6 +46,8 @@