summaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook/v4l/common.xml
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-05-20 00:43:00 -0600
committerGrant Likely <grant.likely@secretlab.ca>2011-05-20 00:43:00 -0600
commit78fab4c04c76b8c9327541bd270f82b85b42bbf7 (patch)
treeb43006348a1ac15c28e6791d08646809761a2a4a /Documentation/DocBook/v4l/common.xml
parent3b8a4dd3ebfcc647260ad5c39ef4f73eb3a6b155 (diff)
parent61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf (diff)
downloadtalos-op-linux-78fab4c04c76b8c9327541bd270f82b85b42bbf7.tar.gz
talos-op-linux-78fab4c04c76b8c9327541bd270f82b85b42bbf7.zip
Merge commit 'v2.6.39' into spi/next
Diffstat (limited to 'Documentation/DocBook/v4l/common.xml')
-rw-r--r--Documentation/DocBook/v4l/common.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/v4l/common.xml b/Documentation/DocBook/v4l/common.xml
index dbab79c215c1..9028721438dc 100644
--- a/Documentation/DocBook/v4l/common.xml
+++ b/Documentation/DocBook/v4l/common.xml
@@ -100,7 +100,7 @@ linux-kernel@vger.kernel.org, 2002-11-20. --></para>
<para>By convention system administrators create various
character device special files with these major and minor numbers in
-the <filename>/dev</filename> directory. The names recomended for the
+the <filename>/dev</filename> directory. The names recommended for the
different V4L2 device types are listed in <xref linkend="devices" />.
</para>
OpenPOWER on IntegriCloud