refresh

diff --git a/meta b/meta
index 89b92b0333c67996c5a63374b962f07c0fcf6833..58f93f4c715d8108d10ddd76ae7b74304bd63d2c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: ca030aeaaa34687fc141f1df10b7ae64d45c70cb
-Head: 8fca0ffeec9b0d653af6504081a9cb75571fbcd8
+Previous: 029fe5418dcbaf0c0742dd75628cf6a42aa2ddf5
+Head: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
-  acm_snoop: 227313311651c5999a362a01b5b5b08625363af6
-  refresh-temp: 8fca0ffeec9b0d653af6504081a9cb75571fbcd8
+  acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
 Unapplied:
   loop: 8ed2a8f7b32e71a8df8a6a3680a221b98943dc41
 Hidden:

diff --git a/patches/acm_snoop b/patches/acm_snoop
index a55026e9e772454bd557d041f700cf11845de8fd..14069948b77ded37f806f138f7f17e90cafc2fde 100644 (file)
--- a/patches/acm_snoop
+++ b/patches/acm_snoop
@@ -6,7 +6,7 @@ Date:   2010-11-15 12:08:46 -0800
 ibacm: fix issuing SA query after recording address
 
 ACM has two ways that it can complete address resolution.  The
-first is to receive a response to an addres resolution query.
+first is to receive a response to an address resolution query.
 The second is to receive a multicast message carrying an address
 resolution request.  In the second case, the address request
 may be between two other nodes.

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index aab3792..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: 586b39cacd2b705239045da946e474cb11840ae8
-Top:    586b39cacd2b705239045da946e474cb11840ae8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-16 16:12:05 -0800
-
-Refresh of acm_snoop
-
----
-
-