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

Commit 708b8eae authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into core/locking

parents d98d38f2 f21f237c

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ Nguyen Anh Quynh <aquynh@gmail.com> 
Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

Patrick Mochel <mochel@digitalimplant.org>

Peter A Jonsson <pj@ludd.ltu.se>

Peter Oruba <peter@oruba.de>

Peter Oruba <peter.oruba@amd.com>

Praveen BP <praveenbp@ti.com>

Rajesh Shah <rajesh.shah@intel.com>

Ralf Baechle <ralf@linux-mips.org>

Documentation/00-INDEX

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ i2c/ 
	- directory with info about the I2C bus/protocol (2 wire, kHz speed).

i2o/

	- directory with info about the Linux I2O subsystem.

i386/

x86/i386/

	- directory with info about Linux on Intel 32 bit architecture.

ia64/

	- directory with info about Linux on Intel 64 bit architecture.
@@ -382,7 +382,7 @@ w1/ 
	- directory with documents regarding the 1-wire (w1) subsystem.

watchdog/

	- how to auto-reboot Linux if it has "fallen and can't get up". ;-)

x86_64/

x86/x86_64/

	- directory with info on Linux support for AMD x86-64 (Hammer) machines.

zorro.txt

	- info on writing drivers for Zorro bus devices found on Amigas.

Documentation/DocBook/deviceiobook.tmpl

+2 −2
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>
@@ -316,7 +316,7 @@ CPU B: spin_unlock_irqrestore(&amp;dev_lock, flags) 


  <chapter id="pubfunctions">

     <title>Public Functions Provided</title>

!Iinclude/asm-x86/io_32.h

!Iarch/x86/include/asm/io_32.h

!Elib/iomap.c

  </chapter>

Documentation/DocBook/kernel-api.tmpl

+5 −5
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ 
     </sect1>



     <sect1><title>Atomic and pointer manipulation</title>

!Iinclude/asm-x86/atomic_32.h

!Iinclude/asm-x86/unaligned.h

!Iarch/x86/include/asm/atomic_32.h

!Iarch/x86/include/asm/unaligned.h

     </sect1>



     <sect1><title>Delaying, scheduling, and timer routines</title>
@@ -119,7 +119,7 @@ X!Ilib/string.c 
!Elib/string.c

     </sect1>

     <sect1><title>Bit Operations</title>

!Iinclude/asm-x86/bitops.h

!Iarch/x86/include/asm/bitops.h

     </sect1>

  </chapter>
@@ -155,7 +155,7 @@ X!Ilib/string.c 
!Emm/slab.c

     </sect1>

     <sect1><title>User Space Memory Access</title>

!Iinclude/asm-x86/uaccess_32.h

!Iarch/x86/include/asm/uaccess_32.h

!Earch/x86/lib/usercopy_32.c

     </sect1>

     <sect1><title>More Memory Management Functions</title>
@@ -265,7 +265,7 @@ X!Earch/x86/kernel/mca_32.c 
-->

	</sect2>

	<sect2><title>MCA Bus DMA</title>

!Iinclude/asm-x86/mca_dma.h

!Iarch/x86/include/asm/mca_dma.h

	</sect2>

     </sect1>

  </chapter>

Documentation/DocBook/kernel-hacking.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -1239,7 +1239,7 @@ static struct block_device_operations opt_fops = { 
  </para>



  <para>

   <filename>include/asm-x86/delay_32.h:</filename>

   <filename>arch/x86/include/asm/delay.h:</filename>

  </para>

  <programlisting>

#define ndelay(n) (__builtin_constant_p(n) ? \
@@ -1265,7 +1265,7 @@ static struct block_device_operations opt_fops = { 
</programlisting>



  <para>

   <filename>include/asm-x86/uaccess_32.h:</filename>

   <filename>arch/x86/include/asm/uaccess_32.h:</filename>

  </para>



  <programlisting>