pop

diff --git a/meta b/meta
index 4818c5e452265857d47683341328e6226521d485..9fd83dc3f2eb59a18c56ebfcda2824d5aa3d955f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 5319f7c2684e592a8564cdd55a9dc01452e51831
-Head: 2945ee3502392e543e39ddfb642057bc80cad9ef
+Previous: 1eb127efe2b10dc0ce46c24d78e71f2f645bb798
+Head: 9f452b8e59adb21b90fbdda980d25a54d4360d37
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -9,6 +9,6 @@ Applied:
   dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
   lower_retries: 25005d0475638542ab125b42d439d853c185402a
   locking: 2945ee3502392e543e39ddfb642057bc80cad9ef
+  1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37
 Unapplied:
-  1.0.4: db24cd6696165aaa0710030188e77be4d6b4cbfd
 Hidden:

diff --git a/patches/1.0.4 b/patches/1.0.4
index 6ec4d78a7e52c00dd4223757c58b479a77717aa4..24a4ac9d28c6b5bc1e0619673ffd8bfcd50ac037 100644 (file)
--- a/patches/1.0.4
+++ b/patches/1.0.4
@@ -1,5 +1,5 @@
-Bottom: 373094ca753531b7dc76712d64a4a7efec7212b5
-Top:    8e4453caaa5bb8cfe126a740d4eaff18a93f4b49
+Bottom: caa30f6e0c510b4add867f1d87a2133c5a4d0bc1
+Top:    667891465c981e5c2a2306399288dd6479ffb80c
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-29 15:02:45 -0800