diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 14:40:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 14:40:58 -0400 |
commit | 80cc38b16389849a6e06441ace4530f6b2497c3c (patch) | |
tree | 1dabc02b0a1faa6b640de20e38aa31bb5d0c443f /Documentation/DocBook | |
parent | 3366dd9fa887ebbda4872e9554f853eaeda764be (diff) | |
parent | 83a35e360433b58791bc9c4e288cace466d62e3a (diff) |
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
...
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r-- | Documentation/DocBook/drm.tmpl | 6 | ||||
-rw-r--r-- | Documentation/DocBook/media/dvb/frontend.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/controls.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/writing_usb_driver.tmpl | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index f9df3b872c16..6dd8d10d6b7e 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl | |||
@@ -434,7 +434,7 @@ char *date;</synopsis> | |||
434 | The DRM core includes two memory managers, namely Translation Table Maps | 434 | The DRM core includes two memory managers, namely Translation Table Maps |
435 | (TTM) and Graphics Execution Manager (GEM). TTM was the first DRM memory | 435 | (TTM) and Graphics Execution Manager (GEM). TTM was the first DRM memory |
436 | manager to be developed and tried to be a one-size-fits-them all | 436 | manager to be developed and tried to be a one-size-fits-them all |
437 | solution. It provides a single userspace API to accomodate the need of | 437 | solution. It provides a single userspace API to accommodate the need of |
438 | all hardware, supporting both Unified Memory Architecture (UMA) devices | 438 | all hardware, supporting both Unified Memory Architecture (UMA) devices |
439 | and devices with dedicated video RAM (i.e. most discrete video cards). | 439 | and devices with dedicated video RAM (i.e. most discrete video cards). |
440 | This resulted in a large, complex piece of code that turned out to be | 440 | This resulted in a large, complex piece of code that turned out to be |
@@ -701,7 +701,7 @@ char *date;</synopsis> | |||
701 | <para> | 701 | <para> |
702 | Similar to global names, GEM file descriptors are also used to share GEM | 702 | Similar to global names, GEM file descriptors are also used to share GEM |
703 | objects across processes. They offer additional security: as file | 703 | objects across processes. They offer additional security: as file |
704 | descriptors must be explictly sent over UNIX domain sockets to be shared | 704 | descriptors must be explicitly sent over UNIX domain sockets to be shared |
705 | between applications, they can't be guessed like the globally unique GEM | 705 | between applications, they can't be guessed like the globally unique GEM |
706 | names. | 706 | names. |
707 | </para> | 707 | </para> |
@@ -1154,7 +1154,7 @@ int max_width, max_height;</synopsis> | |||
1154 | </para> | 1154 | </para> |
1155 | <para> | 1155 | <para> |
1156 | The <methodname>page_flip</methodname> operation schedules a page flip. | 1156 | The <methodname>page_flip</methodname> operation schedules a page flip. |
1157 | Once any pending rendering targetting the new frame buffer has | 1157 | Once any pending rendering targeting the new frame buffer has |
1158 | completed, the CRTC will be reprogrammed to display that frame buffer | 1158 | completed, the CRTC will be reprogrammed to display that frame buffer |
1159 | after the next vertical refresh. The operation must return immediately | 1159 | after the next vertical refresh. The operation must return immediately |
1160 | without waiting for rendering or page flip to complete and must block | 1160 | without waiting for rendering or page flip to complete and must block |
diff --git a/Documentation/DocBook/media/dvb/frontend.xml b/Documentation/DocBook/media/dvb/frontend.xml index df39ba395df0..0d6e81bd9ed2 100644 --- a/Documentation/DocBook/media/dvb/frontend.xml +++ b/Documentation/DocBook/media/dvb/frontend.xml | |||
@@ -233,7 +233,7 @@ typedef enum fe_status { | |||
233 | <entry align="char">The frontend FEC inner coding (Viterbi, LDPC or other inner code) is stable</entry> | 233 | <entry align="char">The frontend FEC inner coding (Viterbi, LDPC or other inner code) is stable</entry> |
234 | </row><row> | 234 | </row><row> |
235 | <entry align="char">FE_HAS_SYNC</entry> | 235 | <entry align="char">FE_HAS_SYNC</entry> |
236 | <entry align="char">Syncronization bytes was found</entry> | 236 | <entry align="char">Synchronization bytes was found</entry> |
237 | </row><row> | 237 | </row><row> |
238 | <entry align="char">FE_HAS_LOCK</entry> | 238 | <entry align="char">FE_HAS_LOCK</entry> |
239 | <entry align="char">The DVB were locked and everything is working</entry> | 239 | <entry align="char">The DVB were locked and everything is working</entry> |
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml index 8d7a77928d49..c2fc9ec1417e 100644 --- a/Documentation/DocBook/media/v4l/controls.xml +++ b/Documentation/DocBook/media/v4l/controls.xml | |||
@@ -3147,7 +3147,7 @@ giving priority to the center of the metered area.</entry> | |||
3147 | <entry>A multi-zone metering. The light intensity is measured | 3147 | <entry>A multi-zone metering. The light intensity is measured |
3148 | in several points of the frame and the the results are combined. The | 3148 | in several points of the frame and the the results are combined. The |
3149 | algorithm of the zones selection and their significance in calculating the | 3149 | algorithm of the zones selection and their significance in calculating the |
3150 | final value is device dependant.</entry> | 3150 | final value is device dependent.</entry> |
3151 | </row> | 3151 | </row> |
3152 | </tbody> | 3152 | </tbody> |
3153 | </entrytbl> | 3153 | </entrytbl> |
diff --git a/Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml b/Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml index 2f82b1da8dfe..8a70a1707b7a 100644 --- a/Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml +++ b/Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml | |||
@@ -24,7 +24,7 @@ into 64x32 macroblocks. The CbCr plane has the same width, in bytes, as the Y | |||
24 | plane (and the image), but is half as tall in pixels. The chroma plane is also | 24 | plane (and the image), but is half as tall in pixels. The chroma plane is also |
25 | grouped into 64x32 macroblocks.</para> | 25 | grouped into 64x32 macroblocks.</para> |
26 | <para>Width of the buffer has to be aligned to the multiple of 128, and | 26 | <para>Width of the buffer has to be aligned to the multiple of 128, and |
27 | height alignment is 32. Every four adjactent buffers - two horizontally and two | 27 | height alignment is 32. Every four adjacent buffers - two horizontally and two |
28 | vertically are grouped together and are located in memory in Z or flipped Z | 28 | vertically are grouped together and are located in memory in Z or flipped Z |
29 | order. </para> | 29 | order. </para> |
30 | <para>Layout of macroblocks in memory is presented in the following | 30 | <para>Layout of macroblocks in memory is presented in the following |
diff --git a/Documentation/DocBook/writing_usb_driver.tmpl b/Documentation/DocBook/writing_usb_driver.tmpl index bd97a13fa5ae..3210dcf741c9 100644 --- a/Documentation/DocBook/writing_usb_driver.tmpl +++ b/Documentation/DocBook/writing_usb_driver.tmpl | |||
@@ -83,7 +83,7 @@ | |||
83 | </para> | 83 | </para> |
84 | <para> | 84 | <para> |
85 | Because each different protocol causes a new driver to be created, I have | 85 | Because each different protocol causes a new driver to be created, I have |
86 | written a generic USB driver skeleton, modeled after the pci-skeleton.c | 86 | written a generic USB driver skeleton, modelled after the pci-skeleton.c |
87 | file in the kernel source tree upon which many PCI network drivers have | 87 | file in the kernel source tree upon which many PCI network drivers have |
88 | been based. This USB skeleton can be found at drivers/usb/usb-skeleton.c | 88 | been based. This USB skeleton can be found at drivers/usb/usb-skeleton.c |
89 | in the kernel source tree. In this article I will walk through the basics | 89 | in the kernel source tree. In this article I will walk through the basics |