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

Commit 159d8133 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 tree updates from Jiri Kosina:
 "Usual rocket science -- mostly documentation and comment updates"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  sparse: fix comment
  doc: fix double words
  isdn: capi: fix "CAPI_VERSION" comment
  doc: DocBook: Fix typos in xml and template file
  Bluetooth: add module name for btwilink
  driver core: unexport static function create_syslog_header
  mmc: core: typo fix in printk specifier
  ARM: spear: clean up editing mistake
  net-sysfs: fix comment typo 'CONFIG_SYFS'
  doc: Insert MODULE_ in module-signing macros
  Documentation: update URL to hfsplus Technote 1150
  gpio: update path to documentation
  ixgbe: Fix format string in ixgbe_fcoe.
  Kconfig: Remove useless "default N" lines
  user_namespace.c: Remove duplicated word in comment
  CREDITS: fix formatting
  treewide: Fix typo in Documentation/DocBook
  mm: Fix warning on make htmldocs caused by slab.c
  ata: ata-samsung_cf: cleanup in header file
  idr: remove unused prototype of idr_free()
parents 05bf58ca c800bcd5

CREDITS

+2 −2
Original line number Diff line number Diff line
@@ -2560,7 +2560,7 @@ S: 22 Seaview St 
S: Fullarton 5063

S: South Australia



N. Wolfgang Muees

N: Wolfgang Muees

E: wolfgang@iksw-muees.de

D: Auerswald USB driver

Documentation/DocBook/media/dvb/dvbproperty.xml

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ get/set up to 64 properties. The actual meaning of each property is described on 
		<para>1)For satellital delivery systems, it is measured in kHz.

			For the other ones, it is measured in Hz.</para>

		<para>2)For ISDB-T, the channels are usually transmitted with an offset of 143kHz.

			E.g. a valid frequncy could be 474143 kHz. The stepping is bound to the bandwidth of

			E.g. a valid frequency could be 474143 kHz. The stepping is bound to the bandwidth of

			the channel which is 6MHz.</para>



		<para>3)As in ISDB-Tsb the channel consists of only one or three segments the

Documentation/DocBook/media/v4l/compat.xml

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ linkend="control" />.</para> 


      <para>The <structfield>depth</structfield> (average number of

bits per pixel) of a video image is implied by the selected image

format. V4L2 does not explicitely provide such information assuming

format. V4L2 does not explicitly provide such information assuming

applications recognizing the format are aware of the image depth and

others need not know. The <structfield>palette</structfield> field

moved into the &v4l2-pix-format;:<informaltable>

Documentation/DocBook/media_api.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ Foundation. A copy of the license is included in the chapter entitled 
	<title>Introduction</title>



	<para>This document covers the Linux Kernel to Userspace API's used by

		video and radio straming devices, including video cameras,

		video and radio streaming devices, including video cameras,

		analog and digital TV receiver cards, AM/FM receiver cards,

		streaming capture devices.</para>

	<para>It is divided into four parts.</para>

Documentation/filesystems/autofs4-mount-control.txt

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ AUTOFS_DEV_IOCTL_OPENMOUNT and AUTOFS_DEV_IOCTL_CLOSEMOUNT 


Obtain and release a file descriptor for an autofs managed mount point

path. The open call requires an initialized struct autofs_dev_ioctl with

the the path field set and the size field adjusted appropriately as well

the path field set and the size field adjusted appropriately as well

as the arg1 field set to the device number of the autofs mount. The

device number can be obtained from the mount options shown in

/proc/mounts. The close call requires an initialized struct