pop

diff --git a/meta b/meta
index 0b5ef57bd5bd232f964e862b9100e987a83c92f0..c78503de21e4c1ea4b18a9e9eac3960e72e0f80a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 9fd2de4b3dd150f6ec00111f5e0c66fb8f1b9c7d
-Head: 9bb8de8ab4a072470d6d17bbde7de89fee3a475b
+Previous: 4ae718d30013be8c225455aff3b61e1e07d37818
+Head: 3f1346eb78bd36573083258f0c8c301e7a9ad728
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
@@ -8,8 +8,8 @@ Applied:
   ipv4: ee6aa496369bc10e9975aa1e013445050a1c4510
   err-resolve-gid: b05ca7c6f1bbced527ed02a9d7cd25a28bf8bf38
   daemonize: 9bb8de8ab4a072470d6d17bbde7de89fee3a475b
+  rel-1.0.6: 3f1346eb78bd36573083258f0c8c301e7a9ad728
 Unapplied:
-  rel-1.0.6: 608e41bbbc2d4eb8d0a8e16573e819bd260adf65
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a
 Hidden:

diff --git a/patches/rel-1.0.6 b/patches/rel-1.0.6
index 1533755d02acfc9dcf109d2e8491aa9dcca6cf43..49e66318d3f01e16d7f64e770ea2e7f8cdaa3f19 100644 (file)
--- a/patches/rel-1.0.6
+++ b/patches/rel-1.0.6
@@ -1,5 +1,5 @@
-Bottom: 0cc8a02808dc9a687049835068f5b166890bd4b7
-Top:    8ee2bb974b4492bb6cfcd5460cc40e455196d496
+Bottom: c46ab6059b0073d98d5ca1e32bce9f872677e6cc
+Top:    37640544a603aae23db5ce2033fdffbf250e7a7f
 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 736f657..7a6e1e8 100644
+index 0ed6168..6d6db89 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -1,11 +1,11 @@