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

Commit 4ecd33d9 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.28-rc4' into x86/apic

parents 7d5a78cd f7160c75

.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

+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>