pop

diff --git a/meta b/meta
index ebfc52c5538ded664054ae53efe519551428f5e1..f47b4ebdae8f9cd1fc5459c77d9516c5f4f655b6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: c05cbd6ed7efbaff8d811d6351b01ab2548524ef
-Head: f5864c3e6d03eef8f041c5d040c887be4c6a7117
+Previous: a423ca002942270f70edafa7fa8e9f86f33b1aa4
+Head: 10d77b5a361567756cdabf3f4be82bf966ea9893
 Applied:
   ibacm-add-performance-counters: f5864c3e6d03eef8f041c5d040c887be4c6a7117
+  ib_acme-add-missing-carriage-r: 10d77b5a361567756cdabf3f4be82bf966ea9893
 Unapplied:
-  ib_acme-add-missing-carriage-r: 1958ff2ca4ff687a0f6fe4116af4173bba4767a2
   acm1.0.5: af72eb3f07335de5fbffd7eed79cbf814859e095
   name2ip: 8e00708e882239292492e13aa51c82042255933c
   addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/ib_acme-add-missing-carriage-r b/patches/ib_acme-add-missing-carriage-r
index 713a65ee59aadf15a26f4d2429922289787604ed..c152b3a8435bd3f5f4578c4a26fbc384aea4a2f2 100644 (file)
--- a/patches/ib_acme-add-missing-carriage-r
+++ b/patches/ib_acme-add-missing-carriage-r
@@ -1,5 +1,5 @@
-Bottom: 131a3de8a72737d956e57cbdeed00328b22d8209
-Top:    3d98f5a3a2be46ced4b026df8246d5d4d43784be
+Bottom: 17be346bccb3202eeaf8e301a5e1b6614b651c95
+Top:    91ec8488425ee8901ad8c14e7daf0ef853248170
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-08-29 16:14:50 -0700