pop

diff --git a/meta b/meta
index b8b35de06283fed8d45c0a5911a574fbb4be74e1..3afad471c95e7f695c6e1afeada7db17eb7d98cc 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 5244744616763fab186897b8acb1c85189f18035
-Head: 6a873fb9e849e52406445250258ee12a2042798b
+Previous: dd0b44ff8e04cec95a9b7f61e474a44e5299f8bd
+Head: 0d9cc006f7dd9a8ea83481eb6870fc5e80d690c1
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -20,6 +20,6 @@ Applied:
   addrinfo: f788ab072e90d0d2165e59d05ceebbe34c0d959b
   notes_man: 9391e2c128b78454a10f0d084259462c3be2fdf2
   def_log: 6a873fb9e849e52406445250258ee12a2042798b
+  1.0.4: 0d9cc006f7dd9a8ea83481eb6870fc5e80d690c1
 Unapplied:
-  1.0.4: 8bd14400a546cabd3c62d8e190b9957dcbe0702e
 Hidden:

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