Changeset 21e76b6 for BOOK/boot


Ignore:
Timestamp:
Jun 13, 2014, 8:59:26 PM (11 years ago)
Author:
William Harrington <kb0iic@…>
Branches:
clfs-3.0.0-systemd, master, systemd
Children:
73e033d
Parents:
d94bdd0 (diff), 4e982a0 (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.
Message:

Merge branch 'master' of cross-lfs.org:cross-lfs

Location:
BOOK/boot
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/mips/kernel.xml

    rd94bdd0 r21e76b6  
    6161    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6262    href="../x86/kernel.xml"
    63     xpointer="xpointer(//*[@os='p'])"/>
    64 
    65     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    66     href="../x86/kernel.xml"
    67     xpointer="xpointer(//*[@os='q'])"/>
    68 
    69     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    70     href="../x86/kernel.xml"
    7163    xpointer="xpointer(//*[@os='s'])"/>
    7264

  • BOOK/boot/mips64/kernel.xml

    rd94bdd0 r21e76b6  
    6565    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6666    href="../x86/kernel.xml"
    67     xpointer="xpointer(//*[@os='p'])"/>
    68 
    69     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    70     href="../x86/kernel.xml"
    71     xpointer="xpointer(//*[@os='q'])"/>
    72 
    73     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    74     href="../x86/kernel.xml"
    7567    xpointer="xpointer(//*[@os='s'])"/>
    7668

  • BOOK/boot/ppc/kernel.xml

    rd94bdd0 r21e76b6  
    6666    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6767    href="../x86/kernel.xml"
    68     xpointer="xpointer(//*[@os='p'])"/>
    69 
    70     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    71     href="../x86/kernel.xml"
    72     xpointer="xpointer(//*[@os='q'])"/>
    73 
    74     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    75     href="../x86/kernel.xml"
    7668    xpointer="xpointer(//*[@os='s'])"/>
    7769

  • BOOK/boot/ppc64/kernel.xml

    rd94bdd0 r21e76b6  
    6565    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6666    href="../x86/kernel.xml"
    67     xpointer="xpointer(//*[@os='p'])"/>
    68 
    69     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    70     href="../x86/kernel.xml"
    71     xpointer="xpointer(//*[@os='q'])"/>
    72 
    73     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    74     href="../x86/kernel.xml"
    7567    xpointer="xpointer(//*[@os='s'])"/>
    7668

  • BOOK/boot/sparc/kernel.xml

    rd94bdd0 r21e76b6  
    6161    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6262    href="../x86/kernel.xml"
    63     xpointer="xpointer(//*[@os='p'])"/>
    64 
    65     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    66     href="../x86/kernel.xml"
    67     xpointer="xpointer(//*[@os='q'])"/>
    68 
    69     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    70     href="../x86/kernel.xml"
    7163    xpointer="xpointer(//*[@os='s'])"/>
    7264

  • BOOK/boot/sparc64/kernel.xml

    rd94bdd0 r21e76b6  
    6363    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6464    href="../x86/kernel.xml"
    65     xpointer="xpointer(//*[@os='p'])"/>
    66 
    67     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    68     href="../x86/kernel.xml"
    69     xpointer="xpointer(//*[@os='q'])"/>
    70 
    71     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    72     href="../x86/kernel.xml"
    7365    xpointer="xpointer(//*[@os='s'])"/>
    7466

  • BOOK/boot/x86/kernel.xml

    rd94bdd0 r21e76b6  
    8282    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8383    href="../../bootable/x86/kernel.xml"
    84     xpointer="xpointer(//*[@os='p'])"/>
    85 
    86     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    87     href="../../bootable/x86/kernel.xml"
    88     xpointer="xpointer(//*[@os='q'])"/>
    89 
    90     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    91     href="../../bootable/x86/kernel.xml"
    9284    xpointer="xpointer(//*[@os='s'])"/>
    9385

  • BOOK/boot/x86_64/kernel.xml

    rd94bdd0 r21e76b6  
    6565    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6666    href="../x86/kernel.xml"
    67     xpointer="xpointer(//*[@os='p'])"/>
    68 
    69     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    70     href="../x86/kernel.xml"
    71     xpointer="xpointer(//*[@os='q'])"/>
    72 
    73     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    74     href="../x86/kernel.xml"
    7567    xpointer="xpointer(//*[@os='s'])"/>
    7668
Note: See TracChangeset for help on using the changeset viewer.