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

Commit e8650a08 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 

Pull trivial updates from Jiri Kosina:
 "As usual, it's mostly typo fixes, redundant code elimination and some
  documentation updates."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (57 commits)
  edac, mips: don't change code that has been removed in edac/mips tree
  xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer
  lib: Change mail address of Oskar Schirmer
  net: Change mail address of Oskar Schirmer
  arm/m68k: Change mail address of Sebastian Hess
  i2c: Change mail address of Oskar Schirmer
  net: Fix tcp_build_and_update_options comment in struct tcp_sock
  atomic64_32.h: fix parameter naming mismatch
  Kconfig: replace "--- help ---" with "---help---"
  c2port: fix bogus Kconfig "default no"
  edac: Fix spelling errors.
  qla1280: Remove redundant NULL check before release_firmware() call
  remoteproc: remove redundant NULL check before release_firmware()
  qla2xxx: Remove redundant NULL check before release_firmware() call.
  aic94xx: Get rid of redundant NULL check before release_firmware() call
  tehuti: delete redundant NULL check before release_firmware()
  qlogic: get rid of a redundant test for NULL before call to release_firmware()
  bna: remove redundant NULL test before release_firmware()
  tg3: remove redundant NULL test before release_firmware() call
  typhoon: get rid of redundant conditional before all to release_firmware()
  ...
parents 3c2c4b73 f70d4a95

CREDITS

+2 −2
Original line number Diff line number Diff line
@@ -3814,8 +3814,8 @@ D: INFO-SHEET, former maintainer 
D: Author of the longest-living linux bug



N: Jonathan Woithe

E: jwoithe@physics.adelaide.edu.au

W: http://www.physics.adelaide.edu.au/~jwoithe

E: jwoithe@just42.net

W: http:/www.just42.net/jwoithe

D: ALS-007 sound card extensions to Sound Blaster driver

S: 20 Jordan St

S: Valley View, SA 5093

Documentation/ABI/testing/sysfs-bus-usb

+2 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ Contact: Matthew Garrett <mjg@redhat.com> 
Description:

		Some information about whether a given USB device is

		physically fixed to the platform can be inferred from a

		combination of hub decriptor bits and platform-specific data

		combination of hub descriptor bits and platform-specific data

		such as ACPI. This file will read either "removable" or

		"fixed" if the information is available, and "unknown"

		otherwise.

Documentation/DocBook/kernel-hacking.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -1289,7 +1289,7 @@ static struct block_device_operations opt_fops = { 
 * Sparc assembly will do this to ya.

 */

C_LABEL(cputypvar):

        .asciz "compatability"

        .asciz "compatibility"



/* Tested on SS-5, SS-10. Probably someone at Sun applied a spell-checker. */

        .align 4

Documentation/DocBook/libata.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -918,7 +918,7 @@ and other resources, etc. 
        <title>HSM violation</title>

        <para>

        This error is indicated when STATUS value doesn't match HSM

        requirement during issuing or excution any ATA/ATAPI command.

        requirement during issuing or execution any ATA/ATAPI command.

        </para>



	<itemizedlist>

Documentation/DocBook/media/v4l/controls.xml

+3 −3
Original line number Diff line number Diff line
@@ -2023,7 +2023,7 @@ Possible values are:</entry> 
		<entry>integer</entry>

	      </row>

	      <row><entry spanname="descr">Cyclic intra macroblock refresh. This is the number of continuous macroblocks

refreshed every frame. Each frame a succesive set of macroblocks is refreshed until the cycle completes and starts from the

refreshed every frame. Each frame a successive set of macroblocks is refreshed until the cycle completes and starts from the

top of the frame. Applicable to H264, H263 and MPEG4 encoder.</entry>

	      </row>
@@ -2183,7 +2183,7 @@ Applicable to the MPEG4 and H264 encoders.</entry> 
		<entry>integer</entry>

	      </row>

	      <row><entry spanname="descr">The Video Buffer Verifier size in kilobytes, it is used as a limitation of frame skip.

The VBV is defined in the standard as a mean to verify that the produced stream will be succesfully decoded.

The VBV is defined in the standard as a mean to verify that the produced stream will be successfully decoded.

The standard describes it as "Part of a hypothetical decoder that is conceptually connected to the

output of the encoder. Its purpose is to provide a constraint on the variability of the data rate that an

encoder or editing process may produce.".
@@ -2196,7 +2196,7 @@ Applicable to the MPEG1, MPEG2, MPEG4 encoders.</entry> 
		<entry>integer</entry>

	      </row>

	      <row><entry spanname="descr">The Coded Picture Buffer size in kilobytes, it is used as a limitation of frame skip.

The CPB is defined in the H264 standard as a mean to verify that the produced stream will be succesfully decoded.

The CPB is defined in the H264 standard as a mean to verify that the produced stream will be successfully decoded.

Applicable to the H264 encoder.</entry>

	      </row>