pop

diff --git a/meta b/meta
index 3278e65f7d900f1bffc66e899ee4df35f9b88c44..beb46217da507eef9532b446243bceb7212e7824 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: 30b8d058a134c920fe640e29131c7faf74069bf6
-Head: 7b9046cc7c36bd011db1af281d2a65e97ee5e159
+Previous: d69637cd2242038e0ef8a6928538e36e82db2b57
+Head: 6f4b68987f24611b3f7e351617b027e188e202db
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   rename-ibacm: 671da1790a0bc0557d41eea2ecae65e7864c2f4f
   file-loc: 7b9046cc7c36bd011db1af281d2a65e97ee5e159
+  init-script: 6f4b68987f24611b3f7e351617b027e188e202db
 Unapplied:
-  init-script: 9c635a29c0fff899915c5ac3775d8cfc748c2573
   fixup-man: 4f65bb9512a9583202efea8f09925aaf0fdf1d86
   rel-1.0.6: a2871fa6feff9e7f40136b7ff1ad4d0de8f482fd
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/init-script b/patches/init-script
index 27f3478dd72e1f877396799cc47804f617233a77..158ce75c6f7afb307403271ba2be02c85e7309b1 100644 (file)
--- a/patches/init-script
+++ b/patches/init-script
@@ -1,5 +1,5 @@
-Bottom: f12645dfa0a12d7006a65beabc21e55ad5dd4037
-Top:    e13cf82bcf8ef15984008ac39bacd58fa4c03925
+Bottom: fe35ebd01a7e33bd5ae2054b404df7fd6e29a418
+Top:    206f4a26e822f79f12e85dfb5bde7c2a9f83413b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-22 10:26:25 -0700