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

Commit d014d043 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-next' into for-linus 

Conflicts:

	kernel/irq/chip.c
parents 6ec22f9b 6070d81e

Documentation/ABI/testing/procfs-diskstats

+1 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ Description: 
		 1 - major number

		 1 - major number

		 2 - minor mumber

		 2 - minor mumber

		 3 - device name

		 3 - device name

		 4 - reads completed succesfully

		 4 - reads completed successfully

		 5 - reads merged

		 5 - reads merged

		 6 - sectors read

		 6 - sectors read

		 7 - time spent reading (ms)

		 7 - time spent reading (ms)

Documentation/ABI/testing/sysfs-block

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ Contact: Jerome Marchand <jmarchan@redhat.com> 
Description:

Description:

		The /sys/block/<disk>/stat files displays the I/O

		The /sys/block/<disk>/stat files displays the I/O

		statistics of disk <disk>. They contain 11 fields:

		statistics of disk <disk>. They contain 11 fields:

		 1 - reads completed succesfully

		 1 - reads completed successfully

		 2 - reads merged

		 2 - reads merged

		 3 - sectors read

		 3 - sectors read

		 4 - time spent reading (ms)

		 4 - time spent reading (ms)

Documentation/DocBook/genericirq.tmpl

+2 −2
Original line number Original line Diff line number Diff line
@@ -417,8 +417,8 @@ desc->chip->end(); 
      </para>

      </para>

      <para>

      <para>

	To make use of the split implementation, replace the call to

	To make use of the split implementation, replace the call to

	__do_IRQ by a call to desc->chip->handle_irq() and associate

	__do_IRQ by a call to desc->handle_irq() and associate

        the appropriate handler function to desc->chip->handle_irq().

        the appropriate handler function to desc->handle_irq().

	In most cases the generic handler implementations should

	In most cases the generic handler implementations should

	be sufficient.

	be sufficient.

     </para>

     </para>

Documentation/DocBook/mtdnand.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -362,7 +362,7 @@ module_exit(board_cleanup); 
	<sect1 id="Multiple_chip_control">

	<sect1 id="Multiple_chip_control">

		<title>Multiple chip control</title>

		<title>Multiple chip control</title>

		<para>

		<para>

			The nand driver can control chip arrays. Therefor the

			The nand driver can control chip arrays. Therefore the

			board driver must provide an own select_chip function. This

			board driver must provide an own select_chip function. This

			function must (de)select the requested chip.

			function must (de)select the requested chip.

			The function pointer in the nand_chip structure must

			The function pointer in the nand_chip structure must

Documentation/DocBook/v4l/videodev2.h.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -492,7 +492,7 @@ struct <link linkend="v4l2-jpegcompression">v4l2_jpegcompression</link> { 
                                 * you do, leave them untouched.

                                 * you do, leave them untouched.

                                 * Inluding less markers will make the

                                 * Inluding less markers will make the

                                 * resulting code smaller, but there will

                                 * resulting code smaller, but there will

                                 * be fewer aplications which can read it.

                                 * be fewer applications which can read it.

                                 * The presence of the APP and COM marker

                                 * The presence of the APP and COM marker

                                 * is influenced by APP_len and COM_len

                                 * is influenced by APP_len and COM_len

                                 * ONLY, not by this property! */

                                 * ONLY, not by this property! */