pop

diff --git a/meta b/meta
index 785738e2c906ae49f9fbd075a43251151b687559..b85d449c7757ac95810ba8688457527a76c36074 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: a9a33c4d09b2853d10b3b839a0a1c59d5031fcd8
-Head: 20e051b4c40928fcddac0d64375acf52bffe86f7
+Previous: 574ba58c97bbbce7fdb58594954fbf8213d22e52
+Head: bf00219bcc090cdfdd4fb155e3de41691e514e27
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -12,8 +12,8 @@ Applied:
   verbose: 6f096f8ddb8a734073e9f0d98cfec82e5dc69097
   dbg_1: 4009e8d08cde895a2c84225a8d5a1f275b15ced9
   no_addr: 20e051b4c40928fcddac0d64375acf52bffe86f7
+  log_port: bf00219bcc090cdfdd4fb155e3de41691e514e27
 Unapplied:
-  log_port: 3552e1cdc8aa9274dff4c314d8cbcfc5ac2e1086
   nodelay: 89973fbe5f8912da1987de5038402b3f7fd209a6
   acme_dest: 1428730a12a1b3a8f99d58c0658efe1f59179ce1
   show_err: c3e388503a184f2ef86785e4186a89aaf75ff235

diff --git a/patches/log_port b/patches/log_port
index 640a153bba2fc9af20d2a1c56c392812a06dd08d..c9329002392633092d2df6dc8c1c060c7ce1e0ea 100644 (file)
--- a/patches/log_port
+++ b/patches/log_port
@@ -1,5 +1,5 @@
-Bottom: 6b06ea561b2b860919b8f7f649491264780cedf6
-Top:    93774bee01ee5cec82073e79735833fd36f4d69d
+Bottom: 2c5bd0cd061ee0b4c29db44daf0155b53b3b7962
+Top:    044c4501996e9d17f7615a6af23ece72b4cf98f4
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 11:51:38 -0800
 
@@ -15,7 +15,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index fbae482..13af503 100644
+index e035741..d9a81d9 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -1597,6 +1597,7 @@ static void CDECL_FUNC acm_retry_handler(void *context)