pop

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

diff --git a/patches/fixup-man b/patches/fixup-man
index 90da814be5db6df24529500efc51a29588f94757..672e31b7764300cf6e3abd9e532d3e9cd19dec82 100644 (file)
--- a/patches/fixup-man
+++ b/patches/fixup-man
@@ -1,5 +1,5 @@
-Bottom: e13cf82bcf8ef15984008ac39bacd58fa4c03925
-Top:    937ae6f3d5625ad455370bf9417a3b8b32e7498b
+Bottom: 206f4a26e822f79f12e85dfb5bde7c2a9f83413b
+Top:    f64639c8ee9ade3de867ad095b9aca1b824c125e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-01 16:54:16 -0800