pop

diff --git a/meta b/meta
index 2bef51233461123afc9977b18b2fa9484d4012fc..3d7d4a32678207c0df8e916ebcabab369d67ecbb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: d16e8781e39e31469a49063ddc56b490908f2487
-Head: 830e850836f3c42c1b896dd19262ec8408e3d606
+Previous: 63810ddbdc0020443f56db3aec94720ffd46cc4c
+Head: 95aa9b300b5be4820af85f11d4ac7609e7cf2f7b
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -15,8 +15,8 @@ Applied:
   log_port: bf00219bcc090cdfdd4fb155e3de41691e514e27
   nodelay: b0e76349b3f3c79e19f09aaf54c4279d78dabfb4
   acme_dest: 830e850836f3c42c1b896dd19262ec8408e3d606
+  show_err: 95aa9b300b5be4820af85f11d4ac7609e7cf2f7b
 Unapplied:
-  show_err: c3e388503a184f2ef86785e4186a89aaf75ff235
   mult_dest: 7b7e4c85ee35ecc407a0c17621e400d97983681b
   addrinfo: a05035a017ce9a31bda79b899afdaed6859a6b9b
   notes_man: c4959298c0958e3cc7179fdd144a94b4e7d946bf

diff --git a/patches/show_err b/patches/show_err
index 437010c89f0b3410b6d6fa76e8c7256d0e39bbd9..f02e396945d8c8d95ad02c56cc047953d169976b 100644 (file)
--- a/patches/show_err
+++ b/patches/show_err
@@ -1,5 +1,5 @@
-Bottom: 2bfe540256ee2c6d427f7e5350c72366adc10ccf
-Top:    52cd9d1676566efbcf414bb677fdab6b145297b6
+Bottom: 38afb583f0799396d81f83049d560532fca17528
+Top:    4caafafdfa3118edc7a5b3276e8812e66f4ffa4e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-07 07:58:54 -0800