diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:34:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:34:56 -0400 |
| commit | d14b7a419a664cd7c1c585c9e7fffee9e9051d53 (patch) | |
| tree | 42a1d5b61b58fa0a75252b082c4c6cef6fa9fd8d /Documentation/video4linux | |
| parent | e8ff13b0bf88b5e696323a1eec877783d965b3c6 (diff) | |
| parent | a58b3a4aba2fd5c445d9deccc73192bff48b591d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Trivial updates all over the place as usual."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (29 commits)
Fix typo in include/linux/clk.h .
pci: hotplug: Fix typo in pci
iommu: Fix typo in iommu
video: Fix typo in drivers/video
Documentation: Add newline at end-of-file to files lacking one
arm,unicore32: Remove obsolete "select MISC_DEVICES"
module.c: spelling s/postition/position/g
cpufreq: Fix typo in cpufreq driver
trivial: typo in comment in mksysmap
mach-omap2: Fix typo in debug message and comment
scsi: aha152x: Fix sparse warning and make printing pointer address more portable.
Change email address for Steve Glendinning
Btrfs: fix typo in convert_extent_bit
via: Remove bogus if check
netprio_cgroup.c: fix comment typo
backlight: fix memory leak on obscure error path
Documentation: asus-laptop.txt references an obsolete Kconfig item
Documentation: ManagementStyle: fixed typo
mm/vmscan: cleanup comment error in balance_pgdat
mm: cleanup on the comments of zone_reclaim_stat
...
Diffstat (limited to 'Documentation/video4linux')
| -rw-r--r-- | Documentation/video4linux/cpia2_overview.txt | 2 | ||||
| -rw-r--r-- | Documentation/video4linux/stv680.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/video4linux/cpia2_overview.txt b/Documentation/video4linux/cpia2_overview.txt index a6e53665216..ad6adbedfe5 100644 --- a/Documentation/video4linux/cpia2_overview.txt +++ b/Documentation/video4linux/cpia2_overview.txt | |||
| @@ -35,4 +35,4 @@ the camera. There are three modes for this. Block mode requests a number | |||
| 35 | of contiguous registers. Random mode reads or writes random registers with | 35 | of contiguous registers. Random mode reads or writes random registers with |
| 36 | a tuple structure containing address/value pairs. The repeat mode is only | 36 | a tuple structure containing address/value pairs. The repeat mode is only |
| 37 | used by VP4 to load a firmware patch. It contains a starting address and | 37 | used by VP4 to load a firmware patch. It contains a starting address and |
| 38 | a sequence of bytes to be written into a gpio port. \ No newline at end of file | 38 | a sequence of bytes to be written into a gpio port. |
diff --git a/Documentation/video4linux/stv680.txt b/Documentation/video4linux/stv680.txt index 4f8946f32f5..e3de3364530 100644 --- a/Documentation/video4linux/stv680.txt +++ b/Documentation/video4linux/stv680.txt | |||
| @@ -50,4 +50,4 @@ The latest info on this driver can be found at: | |||
| 50 | http://personal.clt.bellsouth.net/~kjsisson or at | 50 | http://personal.clt.bellsouth.net/~kjsisson or at |
| 51 | http://stv0680-usb.sourceforge.net | 51 | http://stv0680-usb.sourceforge.net |
| 52 | 52 | ||
| 53 | Any questions to me can be send to: kjsisson@bellsouth.net \ No newline at end of file | 53 | Any questions to me can be send to: kjsisson@bellsouth.net |