new

diff --git a/meta b/meta
index 2ccfba35fd82ebb95b75c024e1283037c8a37f25..d185169470e2bf8e9ad654d2c3fb629c8f615309 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 7cc2a1452f11f64e93a0eae562c3b98355ab943f
-Head: ea78077f0d4a7c2bb513531fac18f03573578b3c
+Previous: 4ecd8fdc9207d46ffd6f8da8154c1550b57964b9
+Head: 4acf16c96b5d92a64836448434711564f8f12cf6
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -18,6 +18,7 @@ Applied:
   show_err: 47d8e33e2f36df1e3b163fcf7e8b0b56604fb944
   mult_dest: 1c8469be405d19304d47fcaf95e7d4aec574a6fc
   addrinfo: ea78077f0d4a7c2bb513531fac18f03573578b3c
+  notes_man: 4acf16c96b5d92a64836448434711564f8f12cf6
 Unapplied:
   1.0.4: a9eb4b771ad6cb9fa2c77201b65fa9e48e068248
 Hidden:

diff --git a/patches/notes_man b/patches/notes_man
new file mode 100644 (file)
index 0000000..fd744e6
--- /dev/null
+++ b/patches/notes_man
@@ -0,0 +1,16 @@
+Bottom: d567db5e39236562dd4e933b9516b73603856409
+Top:    d567db5e39236562dd4e933b9516b73603856409
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-12-08 11:05:34 -0800
+
+ib_acm: merge acm_notes.txt into ib_acm man page
+
+Remove the acm_notes.txt file included with the source
+and integrate the contents with the ib_acm man page.
+
+Signed-off-by: Sean Hefty <sean.hefty@intel.com>
+
+
+---
+
+