pop

diff --git a/meta b/meta
index 4d2bd2ab3346c171dd9ea099384dcda059b2ade4..54f14e2810718ed5fdfc571a7446116798ceddee 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: a74635ccb026842f3f980aaebf08af9214a1d761
-Head: fd58d9ca3871391b52de18f762ed295b9c3470c1
+Previous: 4f0f005f9db9ed1746fcbc109f1dedaa4e99a3b3
+Head: b0d033ea75904f706f93942cd281875b1c5e28f5
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -15,7 +15,7 @@ Applied:
   log_port: 92f81cd1f299db9d83aa21d794cfdfc4c4b5794f
   nodelay: 90b41e985e1f478cda3e4821709cb2ed5e27ee7f
   acme_dest: fd58d9ca3871391b52de18f762ed295b9c3470c1
+  show_err: b0d033ea75904f706f93942cd281875b1c5e28f5
 Unapplied:
-  show_err: aadb98a10bf5192f36dba186eefb696794864ad6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37
 Hidden:

diff --git a/patches/show_err b/patches/show_err
index 6695649aa93cbfe85c8fef0f927d67c86c9f1c32..723e270454176a3dc3ea49e10129b28c019e92ed 100644 (file)
--- a/patches/show_err
+++ b/patches/show_err
@@ -1,5 +1,5 @@
-Bottom: f141944c9884ee22acc7dfcfeed6b44674772b46
-Top:    c2470ba843932ecae54968d05db5285e1b09bb91
+Bottom: 1a6976aae5afc51f4482c9392f83f24867e54446
+Top:    cd2d286a70aa18e04c78f6a86a6ce9d0b4056017
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-07 07:58:54 -0800