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

Commit 0a75c23a authored by Jody McIntyre's avatar Jody McIntyre
Browse files

Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

parents 34b8c399 db9edfd7

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Module.symvers 
# Generated include files

#

include/asm

include/asm-*/asm-offsets.h

include/config

include/linux/autoconf.h

include/linux/compile.h

CREDITS

+1 −0
Original line number Diff line number Diff line
@@ -1883,6 +1883,7 @@ N: Jaya Kumar 
E: jayalk@intworks.biz

W: http://www.intworks.biz

D: Arc monochrome LCD framebuffer driver, x86 reboot fixups

D: pirq addr, CS5535 alsa audio driver

S: Gurgaon, India

S: Kuala Lumpur, Malaysia

Documentation/DocBook/usb.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ 
!Edrivers/usb/core/urb.c

!Edrivers/usb/core/message.c

!Edrivers/usb/core/file.c

!Edrivers/usb/core/driver.c

!Edrivers/usb/core/usb.c

!Edrivers/usb/core/hub.c

    </chapter>

Documentation/SubmittingPatches

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ Even if the maintainer did not respond in step #4, make sure to ALWAYS 
copy the maintainer when you change their code.



For small patches you may want to CC the Trivial Patch Monkey

trivial@rustcorp.com.au set up by Rusty Russell; which collects "trivial"

trivial@kernel.org managed by Adrian Bunk; which collects "trivial"

patches. Trivial patches must qualify for one of the following rules:

 Spelling fixes in documentation

 Spelling fixes which could break grep(1).
@@ -171,7 +171,7 @@ patches. Trivial patches must qualify for one of the following rules: 
 since people copy, as long as it's trivial)

 Any fix by the author/maintainer of the file. (ie. patch monkey

 in re-transmission mode)

URL: <http://www.kernel.org/pub/linux/kernel/people/rusty/trivial/>

URL: <http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/>

Documentation/block/biodoc.txt

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ The following people helped with review comments and inputs for this 
document:

	Christoph Hellwig <hch@infradead.org>

	Arjan van de Ven <arjanv@redhat.com>

	Randy Dunlap <rddunlap@osdl.org>

	Randy Dunlap <rdunlap@xenotime.net>

	Andre Hedrick <andre@linux-ide.org>



The following people helped with fixes/contributions to the bio patches