pop

diff --git a/meta b/meta
index 9800b41742400f360a70e7530beaf253db310d93..5ffd1b925f55994013b7d2343d631122a650bb7d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: abf2230a4204dd5449d2ec20e10d8533c96afdf2
-Head: 1c0e0082347981cf64a56499270ceebb882a2e49
+Previous: 2121c5378ed73f459855811dc1be72f13a585ee9
+Head: 210cb75f62803554bcf4a325a61a4894cfa37c36
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
@@ -8,8 +8,8 @@ Applied:
   ipv4: ee6aa496369bc10e9975aa1e013445050a1c4510
   err-resolve-gid: b05ca7c6f1bbced527ed02a9d7cd25a28bf8bf38
   daemonize: 1c0e0082347981cf64a56499270ceebb882a2e49
+  rel-1.0.6: 210cb75f62803554bcf4a325a61a4894cfa37c36
 Unapplied:
-  rel-1.0.6: d7fd43ec9a7673423198efdce328a917a7e1eeaa
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a
 Hidden:

diff --git a/patches/rel-1.0.6 b/patches/rel-1.0.6
index bddd4775bf970a5334c044634aa3f95c95094524..06d97e3aa5ad972679761ba90d992d3f66dd7c93 100644 (file)
--- a/patches/rel-1.0.6
+++ b/patches/rel-1.0.6
@@ -1,5 +1,5 @@
-Bottom: 231677cdb6de9663d94f70a04f7e943aba36b389
-Top:    95a3cad8410fe98238f90792e0675871c053ffe2
+Bottom: 50077843b8345a1a6c1ef2c6db9ca0e63b9041e4
+Top:    32c4c669876a9f8f4fdb7485c653140e07a35f7a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 15:46:39 -0700
 
@@ -9,7 +9,7 @@ v1.0.6
 ---
 
 diff --git a/configure.in b/configure.in
-index 0ed6168..6d6db89 100644
+index 2ba4883..6d21f48 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -1,11 +1,11 @@