diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 12:00:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 12:00:02 -0800 |
| commit | a2013a13e68354e0c8f3696b69701803e13fb737 (patch) | |
| tree | a7e1da6bfad1aa2afd83f401874d606269ce90b4 /drivers/thermal | |
| parent | dadfab4873256d2145640c0ce468fcbfb48977fe (diff) | |
| parent | 106f9d9337f65bd428c0c79f650e3489e458d771 (diff) | |
| download | linux-3.10-a2013a13e68354e0c8f3696b69701803e13fb737.tar.gz linux-3.10-a2013a13e68354e0c8f3696b69701803e13fb737.tar.bz2 linux-3.10-a2013a13e68354e0c8f3696b69701803e13fb737.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina:
"Usual stuff -- comment/printk typo fixes, documentation updates, dead
code elimination."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
HOWTO: fix double words typo
x86 mtrr: fix comment typo in mtrr_bp_init
propagate name change to comments in kernel source
doc: Update the name of profiling based on sysfs
treewide: Fix typos in various drivers
treewide: Fix typos in various Kconfig
wireless: mwifiex: Fix typo in wireless/mwifiex driver
messages: i2o: Fix typo in messages/i2o
scripts/kernel-doc: check that non-void fcts describe their return value
Kernel-doc: Convention: Use a "Return" section to describe return values
radeon: Fix typo and copy/paste error in comments
doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
various: Fix spelling of "asynchronous" in comments.
Fix misspellings of "whether" in comments.
eisa: Fix spelling of "asynchronous".
various: Fix spelling of "registered" in comments.
doc: fix quite a few typos within Documentation
target: iscsi: fix comment typos in target/iscsi drivers
treewide: fix typo of "suport" in various comments and Kconfig
treewide: fix typo of "suppport" in various comments
...
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 8636fae1f7e..c2c77d1ac49 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -98,7 +98,7 @@ config EXYNOS_THERMAL depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5) depends on CPU_THERMAL help - If you say yes here you get support for TMU (Thermal Managment + If you say yes here you get support for TMU (Thermal Management Unit) on SAMSUNG EXYNOS series of SoC. config DB8500_THERMAL |