diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-14 20:36:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-14 20:36:54 -0400 |
| commit | 7dafd239ab522d38979ebe44d79aa68ad7b1a383 (patch) | |
| tree | 04754a0c6495e57c1fe5f417fbfc99272d353c0e /arch/powerpc/mm | |
| parent | bc47ab0241c7c86da4f5e5f82fbca7d45387c18d (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/slb.c | 2 |
1 files changed, 1 insertions, 1 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 @@ | |||
| 2 | * PowerPC64 SLB support. | 2 | * PowerPC64 SLB support. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2004 David Gibson <dwg@au.ibm.com>, IBM | 4 | * Copyright (C) 2004 David Gibson <dwg@au.ibm.com>, IBM |
| 5 | * Based on earlier code writteh by: | 5 | * Based on earlier code written by: |
| 6 | * Dave Engebretsen and Mike Corrigan {engebret|mikejc}@us.ibm.com | 6 | * Dave Engebretsen and Mike Corrigan {engebret|mikejc}@us.ibm.com |
| 7 | * Copyright (c) 2001 Dave Engebretsen | 7 | * Copyright (c) 2001 Dave Engebretsen |
| 8 | * Copyright (C) 2002 Anton Blanchard <anton@au.ibm.com>, IBM | 8 | * Copyright (C) 2002 Anton Blanchard <anton@au.ibm.com>, IBM |