pop

diff --git a/meta b/meta
index 364c1a67635729f59f84df993c93e11d0e2509e4..bb8da3ce8ea20c64c350e4b78b69c1fff38a5689 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,14 @@
 Version: 1
-Previous: 1f6396c2ffe5016a36944eefaf3e964848138054
-Head: f93f3f442320c63fcb8440d3e7da5a5c7c3241a1
+Previous: f18745b5e758f4de48e8ee9a38d0ef7b83660291
+Head: fd63c4b8b84033117793407c193000cdafefa9c6
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   rename-ibacm: 671da1790a0bc0557d41eea2ecae65e7864c2f4f
   file-loc: 7b9046cc7c36bd011db1af281d2a65e97ee5e159
   init-script: 6f4b68987f24611b3f7e351617b027e188e202db
   fixup-man: f93f3f442320c63fcb8440d3e7da5a5c7c3241a1
+  rel-1.0.6: fd63c4b8b84033117793407c193000cdafefa9c6
 Unapplied:
-  rel-1.0.6: a2871fa6feff9e7f40136b7ff1ad4d0de8f482fd
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a
 Hidden:

diff --git a/patches/rel-1.0.6 b/patches/rel-1.0.6
index 9d6f2417ad4593b39584a1d7fe45f3d5b9289f50..1b0c531ed950a8e8e3e4ac51a75c9b21ceec6517 100644 (file)
--- a/patches/rel-1.0.6
+++ b/patches/rel-1.0.6
@@ -1,5 +1,5 @@
-Bottom: 937ae6f3d5625ad455370bf9417a3b8b32e7498b
-Top:    5f3116fb15056a43291e607fb785ef6458fe0087
+Bottom: f64639c8ee9ade3de867ad095b9aca1b824c125e
+Top:    d31faf0089abde0f7c96d64d599d6a7263ca02e9
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 15:46:39 -0700