diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-08 11:48:51 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-08 11:48:51 -0400 |
commit | dba58e39ced7af63f2748d12bbb2b4ac83c72391 (patch) | |
tree | ee15a5e7667b51d0d0f7e8cb39064652f7c84c28 /arch/x86/mm/mmap.c | |
parent | 9de36825b321fe9fe9cf73260554251af579f4ca (diff) | |
parent | 78ff7fae04554b49d29226ed12536268c2500d1f (diff) |
Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'tracing/textedit' into tracing/core
Diffstat (limited to 'arch/x86/mm/mmap.c')
-rw-r--r-- | arch/x86/mm/mmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c index 56fe7124fbec..165829600566 100644 --- a/arch/x86/mm/mmap.c +++ b/arch/x86/mm/mmap.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Based on code by Ingo Molnar and Andi Kleen, copyrighted | 4 | * Based on code by Ingo Molnar and Andi Kleen, copyrighted |
5 | * as follows: | 5 | * as follows: |
6 | * | 6 | * |
7 | * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. | 7 | * Copyright 2003-2009 Red Hat Inc. |
8 | * All Rights Reserved. | 8 | * All Rights Reserved. |
9 | * Copyright 2005 Andi Kleen, SUSE Labs. | 9 | * Copyright 2005 Andi Kleen, SUSE Labs. |
10 | * Copyright 2007 Jiri Kosina, SUSE Labs. | 10 | * Copyright 2007 Jiri Kosina, SUSE Labs. |