Commit 52347f4e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

parents 1cb9e8e0 48d727a9

Documentation/SubmittingPatches

+2 −2
Original line number Original line 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.

copy the maintainer when you change their code.





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

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:

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

 Spelling fixes in documentation

 Spelling fixes in documentation

 Spelling fixes which could break grep(1).

 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)

 since people copy, as long as it's trivial)

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

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

 in re-transmission mode)

 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 Original line Diff line number Diff line
@@ -31,7 +31,7 @@ The following people helped with review comments and inputs for this 
document:

document:

	Christoph Hellwig <hch@infradead.org>

	Christoph Hellwig <hch@infradead.org>

	Arjan van de Ven <arjanv@redhat.com>

	Arjan van de Ven <arjanv@redhat.com>

	Randy Dunlap <rddunlap@osdl.org>

	Randy Dunlap <rdunlap@xenotime.net>

	Andre Hedrick <andre@linux-ide.org>

	Andre Hedrick <andre@linux-ide.org>





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

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

Documentation/filesystems/00-INDEX

+0 −2
Original line number Original line Diff line number Diff line
@@ -18,8 +18,6 @@ devfs/ 
	- directory containing devfs documentation.

	- directory containing devfs documentation.

ext2.txt

ext2.txt

	- info, mount options and specifications for the Ext2 filesystem.

	- info, mount options and specifications for the Ext2 filesystem.

fat_cvf.txt

	- info on the Compressed Volume Files extension to the FAT filesystem

hpfs.txt

hpfs.txt

	- info and mount options for the OS/2 HPFS.

	- info and mount options for the OS/2 HPFS.

isofs.txt

isofs.txt

Documentation/filesystems/vfs.txt

+2 −3
Original line number Original line Diff line number Diff line
@@ -162,9 +162,8 @@ get_sb() method fills in is the "s_op" field. This is a pointer to 
a "struct super_operations" which describes the next level of the

a "struct super_operations" which describes the next level of the

filesystem implementation.

filesystem implementation.





Usually, a filesystem uses generic one of the generic get_sb()

Usually, a filesystem uses one of the generic get_sb() implementations

implementations and provides a fill_super() method instead. The

and provides a fill_super() method instead. The generic methods are:

generic methods are:





  get_sb_bdev: mount a filesystem residing on a block device

  get_sb_bdev: mount a filesystem residing on a block device

Documentation/scsi/scsi_mid_low_api.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -1452,7 +1452,7 @@ The following people have contributed to this document: 
        Christoph Hellwig <hch at infradead dot org>

        Christoph Hellwig <hch at infradead dot org>

        Doug Ledford <dledford at redhat dot com>

        Doug Ledford <dledford at redhat dot com>

        Andries Brouwer <Andries dot Brouwer at cwi dot nl>

        Andries Brouwer <Andries dot Brouwer at cwi dot nl>

        Randy Dunlap <rddunlap at osdl dot org>

        Randy Dunlap <rdunlap at xenotime dot net>

        Alan Stern <stern at rowland dot harvard dot edu>

        Alan Stern <stern at rowland dot harvard dot edu>