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

Commit bd45ac0c authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'linux-2.6'

parents 4eece4cc 5bdeae46

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
*.i

*.lst

*.symtypes

*.order



#

# Top-level generic files

CREDITS

+16 −0
Original line number Diff line number Diff line
@@ -1353,6 +1353,14 @@ S: Gen Stedmanstraat 212 
S: 5623 HZ Eindhoven

S: The Netherlands



N: Oliver Hartkopp

E: oliver.hartkopp@volkswagen.de

W: http://www.volkswagen.de

D: Controller Area Network (network layer core)

S: Brieffach 1776

S: 38436 Wolfsburg

S: Germany



N: Andrew Haylett

E: ajh@primag.co.uk

D: Selection mechanism
@@ -3306,6 +3314,14 @@ S: Universit=E9 de Rennes I 
S: F-35042 Rennes Cedex

S: France



N: Urs Thuermann

E: urs.thuermann@volkswagen.de

W: http://www.volkswagen.de

D: Controller Area Network (network layer core)

S: Brieffach 1776

S: 38436 Wolfsburg

S: Germany



N: Jon Tombs

E: jon@gte.esi.us.es

W: http://www.esi.us.es/~jon

Documentation/DocBook/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \ 
	    procfs-guide.xml writing_usb_driver.xml \

	    kernel-api.xml filesystems.xml lsm.xml usb.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

	    genericirq.xml s390-drivers.xml uio-howto.xml

	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml



###

# The build process is as follows (targets):

Documentation/DocBook/kernel-api.tmpl

+7 −1
Original line number Diff line number Diff line
@@ -419,7 +419,13 @@ X!Edrivers/pnp/system.c 


  <chapter id="blkdev">

     <title>Block Devices</title>

!Eblock/ll_rw_blk.c

!Eblock/blk-core.c

!Eblock/blk-map.c

!Iblock/blk-sysfs.c

!Eblock/blk-settings.c

!Eblock/blk-exec.c

!Eblock/blk-barrier.c

!Eblock/blk-tag.c

  </chapter>



  <chapter id="chrdev">

Documentation/DocBook/s390-drivers.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ 
!Iinclude/asm-s390/ccwdev.h

!Edrivers/s390/cio/device.c

!Edrivers/s390/cio/device_ops.c

!Edrivers/s390/cio/airq.c

    </sect1>

    <sect1 id="cmf">

     <title>The channel-measurement facility</title>