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

Commit 7ca6448d authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner
Browse files

Merge with rsync://fileserver/linux 

Update to Linus latest
parents f1f67a98 7d681b23

CREDITS

+11 −7
Original line number Diff line number Diff line
@@ -1880,6 +1880,13 @@ S: Schlehenweg 9 
S: D-91080 Uttenreuth

S: Germany



N: Jaya Kumar

E: jayalk@intworks.biz

W: http://www.intworks.biz

D: Arc monochrome LCD framebuffer driver, x86 reboot fixups

S: Gurgaon, India

S: Kuala Lumpur, Malaysia



N: Gabor Kuti

M: seasons@falcon.sch.bme.hu

M: seasons@makosteszta.sote.hu
@@ -2373,9 +2380,10 @@ E: tmolina@cablespeed.com 
D: bug fixes, documentation, minor hackery



N: James Morris

E: jmorris@intercode.com.au

E: jmorris@redhat.com

W: http://www.intercode.com.au/jmorris/

D: Netfilter, Linux Security Modules (LSM).

D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,

D: Crypto API, general networking, miscellaneous.

S: PO Box 707

S: Spit Junction NSW 2088

S: Australia
@@ -2475,13 +2483,9 @@ S: Potsdam, New York 13676 
S: USA



N: Dave Neuer

E: dneuer@innovation-charter.com

E: mr_fred_smoothie@yahoo.com

E: dave.neuer@pobox.com

D: Helped implement support for Compaq's H31xx series iPAQs

D: Other mostly minor tweaks & bugfixes

S: 325 E. Main St., Suite 3

S: Carnegie, PA 15105

S: USA



N: Michael Neuffer

E: mike@i-Connect.Net

Documentation/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ java.txt 
	- info on the in-kernel binary support for Java(tm).

kbuild/

	- directory with info about the kernel build process.

kdumpt.txt

       - mini HowTo on getting the crash dump code to work.

kernel-doc-nano-HOWTO.txt

	- mini HowTo on generation and location of kernel documentation files.

kernel-docs.txt

Documentation/Changes

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ o PPP 2.4.0 # pppd --version 
o  isdn4k-utils           3.1pre1                 # isdnctrl 2>&1|grep version

o  nfs-utils              1.0.5                   # showmount --version

o  procps                 3.2.0                   # ps --version

o  oprofile               0.5.3                   # oprofiled --version

o  oprofile               0.9                     # oprofiled --version



Kernel compilation

==================

Documentation/DocBook/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \

	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \

	    procfs-guide.xml writing_usb_driver.xml scsidrivers.xml \

	    procfs-guide.xml writing_usb_driver.xml \

	    sis900.xml kernel-api.xml journal-api.xml lsm.xml usb.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml
@@ -49,7 +49,7 @@ installmandocs: mandocs 
KERNELDOC = scripts/kernel-doc

DOCPROC   = scripts/basic/docproc



XMLTOFLAGS = -m Documentation/DocBook/stylesheet.xsl

XMLTOFLAGS = -m $(srctree)/Documentation/DocBook/stylesheet.xsl

#XMLTOFLAGS += --skip-validation



###

Documentation/DocBook/kernel-api.tmpl

+1 −2
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ X!Ekernel/module.c 
  <chapter id="hardware">

     <title>Hardware Interfaces</title>

     <sect1><title>Interrupt Handling</title>

!Iarch/i386/kernel/irq.c

!Ikernel/irq/manage.c

     </sect1>



     <sect1><title>Resources Management</title>
@@ -338,7 +338,6 @@ X!Earch/i386/kernel/mca.c 
X!Iinclude/linux/device.h

-->

!Edrivers/base/driver.c

!Edrivers/base/class_simple.c

!Edrivers/base/core.c

!Edrivers/base/firmware_class.c

!Edrivers/base/transport_class.c