pop

diff --git a/meta b/meta
index 7c7e2e3ec0beb36fd24cc745479026f98ec6127c..d50448047896e9f417ea2f284aa7816bf4fab0d1 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: dfbb6fa62f210bc5a255c33ca37bba0161dafe22
-Head: 77cdfebd3c888052e7dd752f0191dfca26a2d137
+Previous: 61cb299cd810969ce66053edd6fff6492d0cb24b
+Head: 8bd14400a546cabd3c62d8e190b9957dcbe0702e
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -19,6 +19,6 @@ Applied:
   mult_dest: 1c8469be405d19304d47fcaf95e7d4aec574a6fc
   addrinfo: ea78077f0d4a7c2bb513531fac18f03573578b3c
   notes_man: 77cdfebd3c888052e7dd752f0191dfca26a2d137
+  1.0.4: 8bd14400a546cabd3c62d8e190b9957dcbe0702e
 Unapplied:
-  1.0.4: a9eb4b771ad6cb9fa2c77201b65fa9e48e068248
 Hidden:

diff --git a/patches/1.0.4 b/patches/1.0.4
index 544892c32df3853bf58c3ffe84ef5f5bdf661cc0..68b13072b83dd156c1e0cd4dff7476383708a8b1 100644 (file)
--- a/patches/1.0.4
+++ b/patches/1.0.4
@@ -1,5 +1,5 @@
-Bottom: d567db5e39236562dd4e933b9516b73603856409
-Top:    f1332a008844673e4533c394c3ba500b0059fc77
+Bottom: ed3b4c384899490638369a7bde63f5f7484e691b
+Top:    e5b4170b67e97fa68df07105a81eacd48b1daae5
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-29 15:02:45 -0800