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

Commit cbe56159 authored by Kumar Gala's avatar Kumar Gala
Browse files

Merge branch 'master' into 83xx

parents 67c2b7d9 17e0e270

CREDITS

+10 −0
Original line number Diff line number Diff line
@@ -2571,6 +2571,16 @@ S: Subiaco, 6008 
S: Perth, Western Australia

S: Australia



N: Miguel Ojeda Sandonis

E: maxextreme@gmail.com

D: Author: Auxiliary LCD Controller driver (ks0108)

D: Author: Auxiliary LCD driver (cfag12864b)

D: Author: Auxiliary LCD framebuffer driver (cfag12864bfb)

D: Maintainer: Auxiliary display drivers tree (drivers/auxdisplay/*)

S: C/ Mieses 20, 9-B

S: Valladolid 47009

S: Spain



N: Greg Page

E: gpage@sovereign.org

D: IPX development and support

Documentation/ABI/testing/debugfs-pktcdvd

+2 −3
Original line number Diff line number Diff line 
What:           /debug/pktcdvd/pktcdvd[0-7]

Date:           Oct. 2006

KernelVersion:  2.6.19

KernelVersion:  2.6.20

Contact:        Thomas Maier <balagi@justmail.de>

Description:
@@ -11,8 +11,7 @@ The pktcdvd module (packet writing driver) creates 
these files in debugfs:



/debug/pktcdvd/pktcdvd[0-7]/

    info            (0444) Lots of human readable driver

                           statistics and infos. Multiple lines!

    info            (0444) Lots of driver statistics and infos.



Example:

-------

Documentation/ABI/testing/sysfs-class-pktcdvd

+1 −1
Original line number Diff line number Diff line 
What:           /sys/class/pktcdvd/

Date:           Oct. 2006

KernelVersion:  2.6.19

KernelVersion:  2.6.20

Contact:        Thomas Maier <balagi@justmail.de>

Description:

Documentation/DocBook/gadget.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -482,13 +482,13 @@ slightly. 
<para>Gadget drivers

rely on common USB structures and constants

defined in the

<filename>&lt;linux/usb_ch9.h&gt;</filename>

<filename>&lt;linux/usb/ch9.h&gt;</filename>

header file, which is standard in Linux 2.6 kernels.

These are the same types and constants used by host

side drivers (and usbcore).

</para>



!Iinclude/linux/usb_ch9.h

!Iinclude/linux/usb/ch9.h

</sect1>



<sect1 id="core"><title>Core Objects and Methods</title>

Documentation/DocBook/kernel-api.tmpl

+3 −0
Original line number Diff line number Diff line
@@ -316,6 +316,9 @@ X!Earch/i386/kernel/mca.c 
     <sect1><title>DMI Interfaces</title>

!Edrivers/firmware/dmi_scan.c

     </sect1>

     <sect1><title>EDD Interfaces</title>

!Idrivers/firmware/edd.c

     </sect1>

  </chapter>



  <chapter id="security">