pop

diff --git a/meta b/meta
index 1f44579118a4c38c0c30be3517de3c0cf6cd3e8d..6cca15110eb67197c3e563eecdbbca741454ffe5 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: ad8fbb517ff019e2c14134ee76dcb9f7b56737e6
-Head: 6f7d102e3fb3979264e5de301035e647df6f0373
+Previous: c80cc0fa59a6a40e7688453850d8f75cbf3f1c6e
+Head: f27b20c5573a044b631b46d8750f97b8fc7cb836
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   rename-ibacm: 62fc4bdee12905d85332875439240523fad7bee0
   file-loc: 6f7d102e3fb3979264e5de301035e647df6f0373
+  init-script: f27b20c5573a044b631b46d8750f97b8fc7cb836
 Unapplied:
-  init-script: 0eb36b8d494d7d51ed3d25c71289c2f5abd845f9
   fixup-man: 3b3d0caee4b583c2853c12c6728dbfac03d544f9
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/init-script b/patches/init-script
index 520641cca1b425df981056f686252f244ed44a54..611fa942fd5ed8ea64f3c88da8e5c717c03c9482 100644 (file)
--- a/patches/init-script
+++ b/patches/init-script
@@ -1,5 +1,5 @@
-Bottom: b7ef43780109283b77986862aa8504222eb78bce
-Top:    a3cb4424d2de12c0dffe8f97350084a997801ace
+Bottom: 80a25ead5e5cb7d2944f448fe3bd29145d9aaf0f
+Top:    dcf951b3c588cacc6e152ff068f41e91b55be9ed
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-22 10:26:25 -0700