pop

diff --git a/meta b/meta
index b14649619de2a845a08efadcda45f8cd0705d1da..9db460ada0be800868815eea947fb96863f39133 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 4529121b0905992027f369e24688375b7de2c458
-Head: 095db89db1f11f6f35d3c9d330696aa74321aba1
+Previous: 398e0562f13484c0138c7e7e3b8c8a7d7072a405
+Head: 6b1139f032257843033701e76968dba6580b5f3f
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
@@ -8,8 +8,8 @@ Applied:
   ipv4: ee6aa496369bc10e9975aa1e013445050a1c4510
   err-resolve-gid: b05ca7c6f1bbced527ed02a9d7cd25a28bf8bf38
   daemonize: 095db89db1f11f6f35d3c9d330696aa74321aba1
+  rel-1.0.6: 6b1139f032257843033701e76968dba6580b5f3f
 Unapplied:
-  rel-1.0.6: f034b76ddefda4ecf9596cb9008f077d4105195f
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a
 Hidden:

diff --git a/patches/rel-1.0.6 b/patches/rel-1.0.6
index 785c7e766c2cfff262cde028681fbd7f4000350a..e3ef8e437d836b6df63d9e24e29c541fa96232d8 100644 (file)
--- a/patches/rel-1.0.6
+++ b/patches/rel-1.0.6
@@ -1,5 +1,5 @@
-Bottom: b937c39f33d5b1c8640372538ff3b72bd7e7b75a
-Top:    d0182450c231f1075854ac9715887d64e5a1c400
+Bottom: 5b7a3a72a9f151c6c89dc82c1c7394599f6076b2
+Top:    1e567135420e1936c54e17988205ff56e0496e3b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 15:46:39 -0700