diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 19:47:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 19:47:22 -0500 |
| commit | 9073e1a804c3096eda84ee7cbf11d1f174236c75 (patch) | |
| tree | 2f1b488b606bc03f8c5ce133f9158196fef07cd2 /drivers/media/rc | |
| parent | 4937e2a6f939a41bf811378e80d71f68aa0950c6 (diff) | |
| parent | 2bb9936beac2eed0c1ed907f83694bc752e159d9 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual earth-shaking, news-breaking, rocket science pile from
trivial.git"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
doc: usb: Fix typo in Documentation/usb/gadget_configs.txt
doc: add missing files to timers/00-INDEX
timekeeping: Fix some trivial typos in comments
mm: Fix some trivial typos in comments
irq: Fix some trivial typos in comments
NUMA: fix typos in Kconfig help text
mm: update 00-INDEX
doc: Documentation/DMA-attributes.txt fix typo
DRM: comment: `halve' -> `half'
Docs: Kconfig: `devlopers' -> `developers'
doc: typo on word accounting in kprobes.c in mutliple architectures
treewide: fix "usefull" typo
treewide: fix "distingush" typo
mm/Kconfig: Grammar s/an/a/
kexec: Typo s/the/then/
Documentation/kvm: Update cpuid documentation for steal time and pv eoi
treewide: Fix common typo in "identify"
__page_to_pfn: Fix typo in comment
Correct some typos for word frequency
clk: fixed-factor: Fix a trivial typo
...
Diffstat (limited to 'drivers/media/rc')
| -rw-r--r-- | drivers/media/rc/keymaps/rc-dib0700-nec.c | 2 | ||||
| -rw-r--r-- | drivers/media/rc/keymaps/rc-dib0700-rc5.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/rc/keymaps/rc-dib0700-nec.c b/drivers/media/rc/keymaps/rc-dib0700-nec.c index 4d13a7f2e5c3..492a05ade7e1 100644 --- a/drivers/media/rc/keymaps/rc-dib0700-nec.c +++ b/drivers/media/rc/keymaps/rc-dib0700-nec.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * TODO: This table is a real mess, as it merges RC codes from several | 5 | * TODO: This table is a real mess, as it merges RC codes from several |
| 6 | * devices into a big table. It also has both RC-5 and NEC codes inside. | 6 | * devices into a big table. It also has both RC-5 and NEC codes inside. |
| 7 | * It should be broken into small tables, and the protocols should properly | 7 | * It should be broken into small tables, and the protocols should properly |
| 8 | * be indentificated. | 8 | * be identificated. |
| 9 | * | 9 | * |
| 10 | * The table were imported from dib0700_devices.c. | 10 | * The table were imported from dib0700_devices.c. |
| 11 | * | 11 | * |
diff --git a/drivers/media/rc/keymaps/rc-dib0700-rc5.c b/drivers/media/rc/keymaps/rc-dib0700-rc5.c index ba81d9697cfc..454ea596a7ee 100644 --- a/drivers/media/rc/keymaps/rc-dib0700-rc5.c +++ b/drivers/media/rc/keymaps/rc-dib0700-rc5.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * TODO: This table is a real mess, as it merges RC codes from several | 5 | * TODO: This table is a real mess, as it merges RC codes from several |
| 6 | * devices into a big table. It also has both RC-5 and NEC codes inside. | 6 | * devices into a big table. It also has both RC-5 and NEC codes inside. |
| 7 | * It should be broken into small tables, and the protocols should properly | 7 | * It should be broken into small tables, and the protocols should properly |
| 8 | * be indentificated. | 8 | * be identificated. |
| 9 | * | 9 | * |
| 10 | * The table were imported from dib0700_devices.c. | 10 | * The table were imported from dib0700_devices.c. |
| 11 | * | 11 | * |