Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/common/procps.xml

    re59e934 r2b687ad  
    3131<screen os="p2"><userinput>patch -Np1 -i ../&procps-ps_cgroup-patch;</userinput></screen>
    3232
     33    <para os="p3">The following patch fixes an issue where some procps utils
     34    print an error on the screen if the monitor isn't running at 60Hz:</para>
     35
     36<screen os="p4"><userinput>patch -Np1 -i ../&procps-fix_HZ_errors-patch;</userinput></screen>
     37
    3338    <para os="s1">The following fixes an issue with Make 3.82:</para>
    3439
Note: See TracChangeset for help on using the changeset viewer.