pop

diff --git a/meta b/meta
index 2faeb9fa3350a8505270635be38327ad2fff1ef8..eea56bc69cd9e15c86368c08d415ad86476b3a6f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: b2efc32fa8361ad9907ae2df4dafcd4f3fb20fbb
-Head: 5aaf38cf02875897413ce853df5d01592aa10a17
+Previous: 31cfb3a85cb725f99ccb83c98a1609e0cced46fc
+Head: f8c16b55b0f82a6eb667a3ef82aca8cb4f8fd714
 Applied:
   locking: 49fcc60d268ba85ee40dc4a4e7d3a4faac3abe9b
   verbose: ab647a30aa155e72a51f9e7e228d558b8db6ec2a
@@ -15,6 +15,6 @@ Applied:
   notes_man: 3d3b9ac02e0a3d11746b3ca601d4d73d918b411f
   def_log: f43faea8e7780d67919ebc6c1a435bcf3903e947
   rm_acm_msg: 5aaf38cf02875897413ce853df5d01592aa10a17
+  1.0.4: f8c16b55b0f82a6eb667a3ef82aca8cb4f8fd714
 Unapplied:
-  1.0.4: d587d496a0d6a0a997b2f09345dd483ae1d9a5a8
 Hidden:

diff --git a/patches/1.0.4 b/patches/1.0.4
index b5bb3ab2f77866ad11a87391fd9325dcc47ffd7a..82f8d53366ceb9136c1b2c47e42b9cf17b2a5a86 100644 (file)
--- a/patches/1.0.4
+++ b/patches/1.0.4
@@ -1,5 +1,5 @@
-Bottom: 73282e0f0d61bd4c4fc726f5436d4d479aa5ac42
-Top:    c17e05ab89c3b27ef2aa50b1000b5509e7cbb532
+Bottom: 5367b34c78eebaff36d0f9720dcc10bd2f69ff4f
+Top:    72732a02cc57d8725dfc280e1bc4aae22ad383d4
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-29 15:02:45 -0800