diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 13:46:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 13:46:25 -0700 |
| commit | 489f7ab6c18cdd64a2d444e056d60a0e722f4ad7 (patch) | |
| tree | 2c7ed6a0042dc15c91ece08c5a3866f610ddca6d /arch | |
| parent | b322b7816908487c08b89b72f838174c37d8c836 (diff) | |
| parent | 82d27b2b2f3a80ffa7759a49b9cba39e47df476e (diff) | |
| download | linux-489f7ab6c18cdd64a2d444e056d60a0e722f4ad7.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (31 commits)
trivial: remove the trivial patch monkey's name from SubmittingPatches
trivial: Fix a typo in comment of addrconf_dad_start()
trivial: usb: fix missing space typo in doc
trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug
trivial: Remove the hyphen from git commands
trivial: fix ETIMEOUT -> ETIMEDOUT typos
trivial: Kconfig: .ko is normally not included in module names
trivial: SubmittingPatches: fix typo
trivial: Documentation/dell_rbu.txt: fix typos
trivial: Fix Pavel's address in MAINTAINERS
trivial: ftrace:fix description of trace directory
trivial: unnecessary (void*) cast removal in sound/oss/msnd.c
trivial: input/misc: Fix typo in Kconfig
trivial: fix grammo in bus_for_each_dev() kerneldoc
trivial: rbtree.txt: fix rb_entry() parameters in sample code
trivial: spelling fix in ppc code comments
trivial: fix typo in bio_alloc kernel doc
trivial: Documentation/rbtree.txt: cleanup kerneldoc of rbtree.txt
trivial: Miscellaneous documentation typo fixes
trivial: fix typo milisecond/millisecond for documentation and source comments.
...
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-sa1100/jornada720_ssp.c | 4 | ||||
| -rw-r--r-- | arch/blackfin/Kconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/mm/slb.c | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/head.S | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-sa1100/jornada720_ssp.c b/arch/arm/mach-sa1100/jornada720_ssp.c index 28cf36967977..506a5e5a9ad5 100644 --- a/arch/arm/mach-sa1100/jornada720_ssp.c +++ b/arch/arm/mach-sa1100/jornada720_ssp.c @@ -54,7 +54,7 @@ EXPORT_SYMBOL(jornada_ssp_reverse); * timeout after <timeout> rounds. Needs mcu running before its called. * * returns : %mcu output on success - * : %-ETIMEOUT on timeout + * : %-ETIMEDOUT on timeout */ int jornada_ssp_byte(u8 byte) { @@ -82,7 +82,7 @@ EXPORT_SYMBOL(jornada_ssp_byte); * jornada_ssp_inout - decide if input is command or trading byte * * returns : (jornada_ssp_byte(byte)) on success - * : %-ETIMEOUT on timeout failure + * : %-ETIMEDOUT on timeout failure */ int jornada_ssp_inout(u8 byte) { diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index c56fd3eb7c10..a60cfe757914 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -885,7 +885,7 @@ config BFIN_GPTIMERS are unsure, say N. To compile this driver as a module, choose M here: the module - will be called gptimers.ko. + will be called gptimers. choice prompt "Uncached DMA region" diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c index 89497fb04280..3b52c80e5e33 100644 --- a/arch/powerpc/mm/slb.c +++ b/arch/powerpc/mm/slb.c @@ -2,7 +2,7 @@ * PowerPC64 SLB support. * * Copyright (C) 2004 David Gibson <dwg@au.ibm.com>, IBM - * Based on earlier code writteh by: + * Based on earlier code written by: * Dave Engebretsen and Mike Corrigan {engebret|mikejc}@us.ibm.com * Copyright (c) 2001 Dave Engebretsen * Copyright (C) 2002 Anton Blanchard <anton@au.ibm.com>, IBM diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S index 6d227413cbe7..ec6882348520 100644 --- a/arch/s390/kernel/head.S +++ b/arch/s390/kernel/head.S @@ -62,7 +62,7 @@ __HEAD .org 0x100 # # subroutine for loading from tape -# Paramters: +# Parameters: # R1 = device number # R2 = load address .Lloader: |