diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-14 14:29:56 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-14 14:29:56 +1000 |
| commit | bab2e568e03396d86d8e908665ff5ef045675ac8 (patch) | |
| tree | 8f724a4f055603cad5df442ee624d836dbe80832 /arch | |
| parent | aa8689882ee63e881bdb1da0d55d9e623f996458 (diff) | |
| parent | e9af5cfe88e7f9f60977756aef27a63c2a51b39b (diff) | |
Merge commit 'trivial/for-next'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/mm/slb.c | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/head.S | 2 |
2 files changed, 2 insertions, 2 deletions
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: |