import

diff --git a/meta b/meta
index 5b2cf37fa499a8174b6cb3b0570161570b89ae79..2fcec5080c70d38a876497276412f95cb5184708 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: d7cd8c1095a99351267e29a914f4e7e23fe0480a
-Head: 45900a4395fa683e51438d0a0cd1f55fb76d7af1
+Previous: cd66f655680f836afa8b1ed0d83bff9387c885a4
+Head: 690edf1082e91d80346a9189acf11ac3d4ab006e
 Applied:
   0001-acm_notes.txt-Change-DOS-formatting-to-unix-formatti.patch: 45900a4395fa683e51438d0a0cd1f55fb76d7af1
+  0002-ibacm_opts.cfg-Fix-commentary-typo.patch: 690edf1082e91d80346a9189acf11ac3d4ab006e
 Unapplied:
   notes-fmt: 988d784b42cdb9db05b1608a5cdb29c51215bd9e
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/0002-ibacm_opts.cfg-Fix-commentary-typo.patch b/patches/0002-ibacm_opts.cfg-Fix-commentary-typo.patch
new file mode 100644 (file)
index 0000000..cc6a05d
--- /dev/null
+++ b/patches/0002-ibacm_opts.cfg-Fix-commentary-typo.patch
@@ -0,0 +1,26 @@
+Bottom: 43c15e3c62fe2a8ce56efcf9fa62e4a5203bc355
+Top:    67b9338109e18b9d2e1165f7fe029e66d47fde70
+Author: Hal Rosenstock <hal@mellanox.com>
+Date:   2013-06-12 22:18:30 +0300
+
+From 8ad99f2fa32a5079d8510e4447ba59a13aa44c3c Mon Sep 17 00:00:00 2001
+Subject: [PATCH 02/15 acm] ibacm_opts.cfg: Fix commentary typo
+
+Signed-off-by: Hal Rosenstock <hal@mellanox.com>
+
+
+---
+
+diff --git a/ibacm_opts.cfg b/ibacm_opts.cfg
+index 7147fe2..c078aee 100644
+--- a/ibacm_opts.cfg
++++ b/ibacm_opts.cfg
+@@ -21,7 +21,7 @@ log_file /var/log/ibacm.log
+ # Indicates the amount of detailed data written to the log file.  Log levels\r
+ # should be one of the following values:\r
+ # 0 - basic configuration & errors\r
+-# 1 - verbose configuation & errors\r
++# 1 - verbose configuration & errors\r
+ # 2 - verbose operation\r
+ \r
+ log_level 0