pop

diff --git a/meta b/meta
index c3efdaac052f529f753bbfad1160f8600772524b..75ec92e71e56071d66499c7dc13cba5ffe0bcb9f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 26e192fd7a48c2fa45f4ca9855ef6374bf1f05ec
-Head: 7536a46ad1f69e6b7f41adb48bf8ddd2ee1a5129
+Previous: 5a8b5dfc21e1be5c262bea5a9e154b2a8f619c69
+Head: 90b96504395c3e9f4652f4b46d63be3dea3689fe
 Applied:
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
   rs-nodelay: c7515656281368210d75c103cc68c131511debf6
@@ -9,6 +9,6 @@ Applied:
   rs-async-nonblock: 8cea41290e9c701beaa780fd2f412060916ca269
   rs-group-tests: f484de0b80b9369ad12c6b5628bb49a51dfc4ef0
   rs-fulltest: 7536a46ad1f69e6b7f41adb48bf8ddd2ee1a5129
+  old-acm: 90b96504395c3e9f4652f4b46d63be3dea3689fe
 Unapplied:
-  old-acm: 890853ba658370faaeb7621362228e90f036bb17
 Hidden:

diff --git a/patches/old-acm b/patches/old-acm
index ba6393efb7e0c7d7dacea62b7c0d011e31d0d557..a65c20251f963351661bf34a99ccebc0d5fb40a2 100644 (file)
--- a/patches/old-acm
+++ b/patches/old-acm
@@ -1,5 +1,5 @@
-Bottom: a069666dc428f246f9dc954bdb50553367794189
-Top:    f88edc44196caddaa1a1e236d26ce27c4aab8166
+Bottom: 7553b4a2424ee63be0ec596d9d62a0f8512d235c
+Top:    6bbc2f526b97dfafc16e7ec34dc8e4e1ce587f40
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-18 10:00:58 -0700