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 /arch/arm/mach-sti | |
| 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 'arch/arm/mach-sti')
| -rw-r--r-- | arch/arm/mach-sti/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig index 835833e3c4f8..a67f83fd3f78 100644 --- a/arch/arm/mach-sti/Kconfig +++ b/arch/arm/mach-sti/Kconfig | |||
| @@ -30,7 +30,7 @@ config SOC_STIH415 | |||
| 30 | default y | 30 | default y |
| 31 | help | 31 | help |
| 32 | This enables support for STMicroelectronics Digital Consumer | 32 | This enables support for STMicroelectronics Digital Consumer |
| 33 | Electronics family StiH415 parts, primarily targetted at set-top-box | 33 | Electronics family StiH415 parts, primarily targeted at set-top-box |
| 34 | and other digital audio/video applications using Flattned Device | 34 | and other digital audio/video applications using Flattned Device |
| 35 | Trees. | 35 | Trees. |
| 36 | 36 | ||
| @@ -39,7 +39,7 @@ config SOC_STIH416 | |||
| 39 | default y | 39 | default y |
| 40 | help | 40 | help |
| 41 | This enables support for STMicroelectronics Digital Consumer | 41 | This enables support for STMicroelectronics Digital Consumer |
| 42 | Electronics family StiH416 parts, primarily targetted at set-top-box | 42 | Electronics family StiH416 parts, primarily targeted at set-top-box |
| 43 | and other digital audio/video applications using Flattened Device | 43 | and other digital audio/video applications using Flattened Device |
| 44 | Trees. | 44 | Trees. |
| 45 | 45 | ||