pop

diff --git a/meta b/meta
index 6e61d9f17cd48627e0c0d327128af7fef0284806..471e1e6457302268694a5b9dee0bc36f53141c67 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,13 @@
 Version: 1
-Previous: 27468f9d933042e2827d0cbd47c800b7231e5200
-Head: 55398d2e8fcf6e88cb0e474137645775a7e65213
+Previous: 667adf6673e21f0c5a1e29d493242f4269b3eac4
+Head: 299df9b474d21a5bf1f9aa103248198e4198eefd
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   rename-ibacm: 62fc4bdee12905d85332875439240523fad7bee0
   file-loc: 19447bec1a6b2cae7f27654010530f95403c2239
   init-script: 55398d2e8fcf6e88cb0e474137645775a7e65213
+  fixup-man: 299df9b474d21a5bf1f9aa103248198e4198eefd
 Unapplied:
-  fixup-man: 3b3d0caee4b583c2853c12c6728dbfac03d544f9
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a
 Hidden:

diff --git a/patches/fixup-man b/patches/fixup-man
index a9c1a15cd065e688da958acb4ab8382b69b904ce..e12733eb2d6c4958416ad51f8e09a1e97d05e059 100644 (file)
--- a/patches/fixup-man
+++ b/patches/fixup-man
@@ -1,5 +1,5 @@
-Bottom: 2724258e9ed52f80159968b8b63216a7ba8595a6
-Top:    dbd12c9e450afa12621e35dbb8cd04c4f28365ad
+Bottom: 5147fa714d20dcc906e6eaf06c420b07199136ff
+Top:    6966f5b8c3ee15b4f8c8be07854f5b56575d1f10
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-01 16:54:16 -0800