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
  ...

diff --cc Documentation/ABI/testing/sysfs-devices-power
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-tegra/Kconfig
index e426d1b7747e8c5f8ab417de2a4e515e6631e9b0,dd1ae0183ff2a7d0540d18cec6cade84b887fa2e..b442f15fd01a8b7d49b14337c68896486da66cce
--- 1/arch/arm/mach-tegra/Kconfig
--- 2/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -55,8 -55,59 +55,8 @@@ config TEGRA_AH
        help
          Adds AHB configuration functionality for NVIDIA Tegra SoCs,
          which controls AHB bus master arbitration and some
-         perfomance parameters(priority, prefech size).
+         performance parameters(priority, prefech size).
  
 -choice
 -        prompt "Default low-level debug console UART"
 -        default TEGRA_DEBUG_UART_NONE
 -
 -config TEGRA_DEBUG_UART_NONE
 -        bool "None"
 -
 -config TEGRA_DEBUG_UARTA
 -        bool "UART-A"
 -
 -config TEGRA_DEBUG_UARTB
 -        bool "UART-B"
 -
 -config TEGRA_DEBUG_UARTC
 -        bool "UART-C"
 -
 -config TEGRA_DEBUG_UARTD
 -        bool "UART-D"
 -
 -config TEGRA_DEBUG_UARTE
 -        bool "UART-E"
 -
 -endchoice
 -
 -choice
 -      prompt "Automatic low-level debug console UART"
 -      default TEGRA_DEBUG_UART_AUTO_NONE
 -
 -config TEGRA_DEBUG_UART_AUTO_NONE
 -      bool "None"
 -
 -config TEGRA_DEBUG_UART_AUTO_ODMDATA
 -      bool "Via ODMDATA"
 -      help
 -        Automatically determines which UART to use for low-level debug based
 -        on the ODMDATA value. This value is part of the BCT, and is written
 -        to the boot memory device using nvflash, or other flashing tool.
 -        When bits 19:18 are 3, then bits 17:15 indicate which UART to use;
 -        0/1/2/3/4 are UART A/B/C/D/E.
 -
 -config TEGRA_DEBUG_UART_AUTO_SCRATCH
 -      bool "Via UART scratch register"
 -      help
 -        Automatically determines which UART to use for low-level debug based
 -        on the UART scratch register value. Some bootloaders put ASCII 'D'
 -        in this register when they initialize their own console UART output.
 -        Using this option allows the kernel to automatically pick the same
 -        UART.
 -
 -endchoice
 -
  config TEGRA_EMC_SCALING_ENABLE
        bool "Enable scaling the memory frequency"
  

diff --cc arch/arm/plat-s3c24xx/dma.c
Simple merge

diff --cc arch/openrisc/Kconfig
Simple merge

diff --cc arch/x86/kernel/cpu/mtrr/main.c
Simple merge

diff --cc drivers/acpi/acpica/dsopcode.c
Simple merge

diff --cc drivers/char/ipmi/ipmi_si_intf.c
Simple merge

diff --cc drivers/firewire/ohci.c
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpu/drm/radeon/evergreen.c
Simple merge

diff --cc drivers/gpu/drm/radeon/si.c
Simple merge

diff --cc drivers/i2c/busses/i2c-s3c2410.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/md/raid5.c
Simple merge

diff --cc drivers/mmc/host/Kconfig
Simple merge

diff --cc drivers/net/bonding/bonding.h
Simple merge

diff --cc drivers/net/ethernet/8390/ax88796.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
Simple merge

diff --cc drivers/net/ethernet/micrel/ksz884x.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_target.c
Simple merge

diff --cc drivers/scsi/qla2xxx/tcm_qla2xxx.c
Simple merge

diff --cc drivers/staging/comedi/drivers/usbdux.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target_util.c
Simple merge

diff --cc drivers/thermal/Kconfig
index 8636fae1f7ecfa88909b5b4aa7eb39b71722933f,d673ffca87c96722e692ab6042e44ad6f75edd76..c2c77d1ac499d3ccb4d4c141d66986e88e980bf6
--- 1/drivers/thermal/Kconfig
--- 2/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@@ -95,31 -50,8 +95,31 @@@ config RCAR_THERMA
  
  config EXYNOS_THERMAL
        tristate "Temperature sensor on Samsung EXYNOS"
 -      depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5) && THERMAL
 -      select CPU_FREQ_TABLE
 +      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
 +      bool "DB8500 thermal management"
 +      depends on ARCH_U8500
 +      default y
 +      help
 +        Adds DB8500 thermal management implementation according to the thermal
 +        management framework. A thermal zone with several trip points will be
 +        created. Cooling devices can be bound to the trip points to cool this
 +        thermal zone if trip points reached.
 +
 +config DB8500_CPUFREQ_COOLING
 +      tristate "DB8500 cpufreq cooling"
 +      depends on ARCH_U8500
 +      depends on CPU_THERMAL
 +      default y
 +      help
 +        Adds DB8500 cpufreq cooling devices, and these cooling devices can be
 +        bound to thermal zone trip points. When a trip point reached, the
 +        bound cpufreq cooling device turns active to set CPU frequency low to
 +        cool down the CPU.
 +
 +endif

diff --cc drivers/tty/hvc/hvc_opal.c
Simple merge

diff --cc drivers/tty/hvc/hvc_vio.c
Simple merge

diff --cc drivers/tty/serial/bfin_uart.c
Simple merge

diff --cc drivers/tty/serial/icom.c
Simple merge

diff --cc drivers/usb/core/driver.c
Simple merge

diff --cc drivers/usb/gadget/at91_udc.c
Simple merge

diff --cc drivers/usb/storage/realtek_cr.c
Simple merge

diff --cc drivers/vhost/tcm_vhost.c
Simple merge

diff --cc fs/hugetlbfs/inode.c
Simple merge

diff --cc fs/jbd/transaction.c
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc include/linux/stmmac.h
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc kernel/trace/ftrace.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc kernel/trace/trace_functions.c
Simple merge

diff --cc kernel/trace/trace_irqsoff.c
Simple merge

diff --cc kernel/trace/trace_sched_wakeup.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc mm/hugetlb.c
Simple merge

diff --cc mm/memory_hotplug.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/ipv4/tcp_cong.c
Simple merge

diff --cc net/mac80211/driver-ops.h
Simple merge

diff --cc net/sctp/endpointola.c
Simple merge

diff --cc net/sctp/sm_statefuns.c
Simple merge

diff --cc sound/pci/es1968.c
Simple merge

diff --cc sound/pci/ice1712/delta.c
Simple merge

diff --cc sound/pci/sis7019.c
Simple merge