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

Commit 342ff1a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
  trivial: fix typo in aic7xxx comment
  trivial: fix comment typo in drivers/ata/pata_hpt37x.c
  trivial: typo in kernel-parameters.txt
  trivial: fix typo in tracing documentation
  trivial: add __init/__exit macros in drivers/gpio/bt8xxgpio.c
  trivial: add __init macro/ fix of __exit macro location in ipmi_poweroff.c
  trivial: remove unnecessary semicolons
  trivial: Fix duplicated word "options" in comment
  trivial: kbuild: remove extraneous blank line after declaration of usage()
  trivial: improve help text for mm debug config options
  trivial: doc: hpfall: accept disk device to unload as argument
  trivial: doc: hpfall: reduce risk that hpfall can do harm
  trivial: SubmittingPatches: Fix reference to renumbered step
  trivial: fix typos "man[ae]g?ment" -> "management"
  trivial: media/video/cx88: add __init/__exit macros to cx88 drivers
  trivial: fix typo in CONFIG_DEBUG_FS in gcov doc
  trivial: fix missing printk space in amd_k7_smp_check
  trivial: fix typo s/ketymap/keymap/ in comment
  trivial: fix typo "to to" in multiple files
  trivial: fix typos in comments s/DGBU/DBGU/
  ...
parents 50223e48 24ed7a97

Documentation/DocBook/mtdnand.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip) 
			<para>

				The blocks in which the tables are stored are procteted against

				accidental access by marking them bad in the memory bad block

				table. The bad block table managment functions are allowed

				table. The bad block table management functions are allowed

				to circumvernt this protection.

			</para>

			<para>

Documentation/DocBook/scsi.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ 
        <para>

          The SAS transport class contains common code to deal with SAS HBAs,

          an aproximated representation of SAS topologies in the driver model,

          and various sysfs attributes to expose these topologies and managment

          and various sysfs attributes to expose these topologies and management

          interfaces to userspace.

        </para>

        <para>

Documentation/SubmittingPatches

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ the MAN-PAGES maintainer (as listed in the MAINTAINERS file) 
a man-pages patch, or at least a notification of the change,

so that some information makes its way into the manual pages.



Even if the maintainer did not respond in step #4, make sure to ALWAYS

Even if the maintainer did not respond in step #5, make sure to ALWAYS

copy the maintainer when you change their code.



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

Documentation/filesystems/nfsroot.txt

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf> 
		the client address and this parameter is NOT empty only

		replies from the specified server are accepted.



		Only required for for NFS root. That is autoconfiguration

		Only required for NFS root. That is autoconfiguration

		will not be triggered if it is missing and NFS root is not

		in operation.

Documentation/gcov.txt

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ Possible uses: 


Configure the kernel with:



        CONFIG_DEBUGFS=y

        CONFIG_DEBUG_FS=y

        CONFIG_GCOV_KERNEL=y



and to get coverage data for the entire kernel: