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

Commit 80cc38b1 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:
 "The usual stuff from trivial tree"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
  treewide: relase -> release
  Documentation/cgroups/memory.txt: fix stat file documentation
  sysctl/net.txt: delete reference to obsolete 2.4.x kernel
  spinlock_api_smp.h: fix preprocessor comments
  treewide: Fix typo in printk
  doc: device tree: clarify stuff in usage-model.txt.
  open firmware: "/aliasas" -> "/aliases"
  md: bcache: Fixed a typo with the word 'arithmetic'
  irq/generic-chip: fix a few kernel-doc entries
  frv: Convert use of typedef ctl_table to struct ctl_table
  sgi: xpc: Convert use of typedef ctl_table to struct ctl_table
  doc: clk: Fix incorrect wording
  Documentation/arm/IXP4xx fix a typo
  Documentation/networking/ieee802154 fix a typo
  Documentation/DocBook/media/v4l fix a typo
  Documentation/video4linux/si476x.txt fix a typo
  Documentation/virtual/kvm/api.txt fix a typo
  Documentation/early-userspace/README fix a typo
  Documentation/video4linux/soc-camera.txt fix a typo
  lguest: fix CONFIG_PAE -> CONFIG_x86_PAE in comment
  ...
parents 3366dd9f 83a35e36

Documentation/DocBook/drm.tmpl

+3 −3
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ char *date;</synopsis> 
      The DRM core includes two memory managers, namely Translation Table Maps

      (TTM) and Graphics Execution Manager (GEM). TTM was the first DRM memory

      manager to be developed and tried to be a one-size-fits-them all

      solution. It provides a single userspace API to accomodate the need of

      solution. It provides a single userspace API to accommodate the need of

      all hardware, supporting both Unified Memory Architecture (UMA) devices

      and devices with dedicated video RAM (i.e. most discrete video cards).

      This resulted in a large, complex piece of code that turned out to be
@@ -701,7 +701,7 @@ char *date;</synopsis> 
        <para>

          Similar to global names, GEM file descriptors are also used to share GEM

          objects across processes. They offer additional security: as file

          descriptors must be explictly sent over UNIX domain sockets to be shared

          descriptors must be explicitly sent over UNIX domain sockets to be shared

          between applications, they can't be guessed like the globally unique GEM

          names.

        </para>
@@ -1154,7 +1154,7 @@ int max_width, max_height;</synopsis> 
          </para>

          <para>

            The <methodname>page_flip</methodname> operation schedules a page flip.

            Once any pending rendering targetting the new frame buffer has

            Once any pending rendering targeting the new frame buffer has

            completed, the CRTC will be reprogrammed to display that frame buffer

            after the next vertical refresh. The operation must return immediately

            without waiting for rendering or page flip to complete and must block

Documentation/DocBook/media/dvb/frontend.xml

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ typedef enum fe_status { 
<entry align="char">The frontend FEC inner coding (Viterbi, LDPC or other inner code) is stable</entry>

</row><row>

<entry align="char">FE_HAS_SYNC</entry>

<entry align="char">Syncronization bytes was found</entry>

<entry align="char">Synchronization bytes was found</entry>

</row><row>

<entry align="char">FE_HAS_LOCK</entry>

<entry align="char">The DVB were locked and everything is working</entry>

Documentation/DocBook/media/v4l/controls.xml

+1 −1
Original line number Diff line number Diff line
@@ -3147,7 +3147,7 @@ giving priority to the center of the metered area.</entry> 
		  <entry>A multi-zone metering. The light intensity is measured

in several points of the frame and the the results are combined. The

algorithm of the zones selection and their significance in calculating the

final value is device dependant.</entry>

final value is device dependent.</entry>

		</row>

	      </tbody>

	    </entrytbl>

Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ into 64x32 macroblocks. The CbCr plane has the same width, in bytes, as the Y 
plane (and the image), but is half as tall in pixels. The chroma plane is also

grouped into 64x32 macroblocks.</para>

	<para>Width of the buffer has to be aligned to the multiple of 128, and

height alignment is 32. Every four adjactent buffers - two horizontally and two

height alignment is 32. Every four adjacent buffers - two horizontally and two

vertically are grouped together and are located in memory in Z or flipped Z

order. </para>

	<para>Layout of macroblocks in memory is presented in the following

Documentation/DocBook/writing_usb_driver.tmpl

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

  <para>

      Because each different protocol causes a new driver to be created, I have

      written a generic USB driver skeleton, modeled after the pci-skeleton.c

      written a generic USB driver skeleton, modelled after the pci-skeleton.c

      file in the kernel source tree upon which many PCI network drivers have

      been based. This USB skeleton can be found at drivers/usb/usb-skeleton.c

      in the kernel source tree. In this article I will walk through the basics