Changeset 2b687ad for BOOK/materials/common/patches.xml

Timestamp:

Feb 10, 2011, 5:04:43 PM (13 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

8050e8b

Parents:

e59e934 (diff), 6d1db7d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Joe Ciccone <jciccone@…> (02/10/11 16:52:13)

git-committer:

Joe Ciccone <jciccone@…> (02/10/11 17:04:43)

Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/general.ent
BOOK/introduction/common/changelog.xml

File:

• BOOK/materials/common/patches.xml (modified) (1 diff)

BOOK/materials/common/patches.xml

@@ -119 +119 @@
 
     <varlistentry>
+      <term>Procps Fix HZ Errors Patch - <token>&procps-fix_HZ_errors-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&procps-fix_HZ_errors-patch;"/></para>
+        <para>MD5 sum: <literal>&procps-fix_HZ_errors-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Procps ps cgroup Patch - <token>&procps-ps_cgroup-patch-size;</token>:</term>
       <listitem>