pop

diff --git a/meta b/meta
index 08cd140ad8acb5e38982229d19edca12227227fb..082ea219ec528d092d2f3bb1aa669ed08a87be6f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: b70921b68f0603926244d35e44aa08c5d546ae30
-Head: 92f81cd1f299db9d83aa21d794cfdfc4c4b5794f
+Previous: ed8715b32e98ebd1f439a4e27d56dbc031af0e02
+Head: ff186988bcdfb1dedf877485791c46bbe2950902
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -13,8 +13,8 @@ Applied:
   dbg_1: 3258ebd9b3f17653231089184f29ee2352be9d46
   no_addr: 775cf275e0feddd7b884ded8cdc341a919e4f9a6
   log_port: 92f81cd1f299db9d83aa21d794cfdfc4c4b5794f
+  nodelay: ff186988bcdfb1dedf877485791c46bbe2950902
 Unapplied:
-  nodelay: 67540b8773be3a5c4d76cfeb073c2583814b1540
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37
 Hidden:

diff --git a/patches/nodelay b/patches/nodelay
index 7117f800b046dc47785a8a43be90a498eddf9e27..d7042bc6f2d670a25321f4bc5e299664ac760bb1 100644 (file)
--- a/patches/nodelay
+++ b/patches/nodelay
@@ -1,5 +1,5 @@
-Bottom: 03a0e5459709b2fb584adeb4e7f8996886fe1ef7
-Top:    94f7b4014bf248f21ef5a43bd9049268ee765a26
+Bottom: 5cb19eb81ed40ac6bba59f5d10974e9fc25a49af
+Top:    9bd0de553ed9e9568bbdd22a2f0ccafa4a17450f
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 13:07:41 -0800