Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1e302d8 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into tracing/ftrace

parents 944ac425 7f82f000

Documentation/DocBook/deviceiobook.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    <surname>Cox</surname>

    <affiliation>

     <address>

      <email>alan@redhat.com</email>

      <email>alan@lxorguk.ukuu.org.uk</email>

     </address>

    </affiliation>

   </author>

Documentation/DocBook/mcabook.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
    <surname>Cox</surname>

    <affiliation>

     <address>

      <email>alan@redhat.com</email>

      <email>alan@lxorguk.ukuu.org.uk</email>

     </address>

    </affiliation>

   </author>

Documentation/DocBook/wanbook.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
    <surname>Cox</surname>

    <affiliation>

     <address>

      <email>alan@redhat.com</email>

      <email>alan@lxorguk.ukuu.org.uk</email>

     </address>

    </affiliation>

   </author>

Documentation/DocBook/z8530book.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
    <surname>Cox</surname>

    <affiliation>

     <address>

      <email>alan@redhat.com</email>

      <email>alan@lxorguk.ukuu.org.uk</email>

     </address>

    </affiliation>

   </author>

Documentation/ManagementStyle

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ companies. If you sign purchase orders or you have any clue about the 
budget of your group, you're almost certainly not a kernel manager. 

These suggestions may or may not apply to you. 



First off, I'd suggest buying "Seven Habits of Highly Successful

First off, I'd suggest buying "Seven Habits of Highly Effective

People", and NOT read it.  Burn it, it's a great symbolic gesture. 



(*) This document does so not so much by answering the question, but by