pop

diff --git a/meta b/meta
index 57b286ec79543e7a00abbf76a648bcaabbe3a59b..0455608bdd91d5102fb6b0e1d7c3503c5d802672 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: 1bb88ec3b5383ddb0c686514d3d9de2b7a627247
-Head: b60d0c8781b920fad52ac3fb63264ea538cf226a
+Previous: 2379406c266304be39038fd57df2acaab18de189
+Head: 05b2741e5c346be2ed80a63d3213487f2b2f808c
 Applied:
   rs-locking: ec6a8efe211b0dc98548443c2e0d67e2c355351f
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
   rstream-delay: b60d0c8781b920fad52ac3fb63264ea538cf226a
+  rstream-async-opt: 05b2741e5c346be2ed80a63d3213487f2b2f808c
 Unapplied:
-  rstream-async-opt: 363e693c1e12b1478d782141103f639af1979b8d
   comp_locks: b89aab130b4619806557e11e6b9c10964f00743f
   preload: 5dfe7abc07064485c5100e04e5412279244c2bc3
 Hidden:

diff --git a/patches/rstream-async-opt b/patches/rstream-async-opt
index a739f4897d8ce92ed1b9ce24a36519c9655d4899..7f44c78417cfb8d1a9499d58c8b2a99ace5e9e8c 100644 (file)
--- a/patches/rstream-async-opt
+++ b/patches/rstream-async-opt
@@ -1,5 +1,5 @@
-Bottom: 4824ade2aa44138cac7516403f6a7045fea3dbee
-Top:    6f06120e0a9c54c1159bf2ce7335b8994f8497f5
+Bottom: e158cfb023f019d4ef91f72e39f049c35cf5993e
+Top:    cf88942daee97c712f00f5b3c85efe180c90b3d3
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-11 10:41:02 -0700