Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Linus Torvalds [Thu, 13 Dec 2012 20:00:02 +0000 (12:00 -0800)]
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
  ...

54 files changed:
1  2 
Documentation/ABI/testing/sysfs-devices-power
MAINTAINERS
arch/arm/mach-tegra/Kconfig
arch/arm/plat-s3c24xx/dma.c
arch/openrisc/Kconfig
arch/x86/kernel/cpu/mtrr/main.c
drivers/acpi/acpica/dsopcode.c
drivers/char/ipmi/ipmi_si_intf.c
drivers/firewire/ohci.c
drivers/gpio/Kconfig
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/si.c
drivers/i2c/busses/i2c-s3c2410.c
drivers/md/md.c
drivers/md/raid5.c
drivers/mmc/host/Kconfig
drivers/net/bonding/bonding.h
drivers/net/ethernet/8390/ax88796.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
drivers/net/ethernet/micrel/ksz884x.c
drivers/scsi/qla2xxx/qla_target.c
drivers/scsi/qla2xxx/tcm_qla2xxx.c
drivers/staging/comedi/drivers/usbdux.c
drivers/target/iscsi/iscsi_target_util.c
drivers/thermal/Kconfig
drivers/tty/hvc/hvc_opal.c
drivers/tty/hvc/hvc_vio.c
drivers/tty/serial/bfin_uart.c
drivers/tty/serial/icom.c
drivers/usb/core/driver.c
drivers/usb/gadget/at91_udc.c
drivers/usb/storage/realtek_cr.c
drivers/vhost/tcm_vhost.c
fs/hugetlbfs/inode.c
fs/jbd/transaction.c
include/linux/netdevice.h
include/linux/stmmac.h
include/net/sock.h
kernel/trace/ftrace.c
kernel/trace/trace.c
kernel/trace/trace_functions.c
kernel/trace/trace_irqsoff.c
kernel/trace/trace_sched_wakeup.c
lib/Kconfig.debug
mm/hugetlb.c
mm/memory_hotplug.c
mm/page_alloc.c
net/ipv4/tcp_cong.c
net/mac80211/driver-ops.h
net/sctp/endpointola.c
net/sctp/sm_statefuns.c
sound/pci/es1968.c
sound/pci/ice1712/delta.c
sound/pci/sis7019.c

diff --cc MAINTAINERS
Simple merge
@@@ -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"
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc drivers/md/md.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/hugetlb.c
Simple merge
Simple merge
diff --cc mm/page_alloc.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge