diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-08-27 19:17:07 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-08-27 19:17:07 -0700 |
| commit | b30a72a7edfc64c8929104d5c2178aca489aa559 (patch) | |
| tree | 2b26c155c318d08d946bd2d70cf815dcdb29a243 /arch/arm/mach-integrator/cpu.c | |
| parent | f1c5d30e1d79bbfb60eaf189db862d3cb2bcac92 (diff) | |
| parent | c1b362e3b4d331a63915b268a33207311a439d60 (diff) | |
| download | blackbird-op-linux-b30a72a7edfc64c8929104d5c2178aca489aa559.tar.gz blackbird-op-linux-b30a72a7edfc64c8929104d5c2178aca489aa559.zip | |
Merge branch 'x86/urgent' into x86/cpu
Conflicts:
arch/x86/kernel/cpu/cyrix.c
Diffstat (limited to 'arch/arm/mach-integrator/cpu.c')
| -rw-r--r-- | arch/arm/mach-integrator/cpu.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c index ce5ea7c26675..7c49d55e6b27 100644 --- a/arch/arm/mach-integrator/cpu.c +++ b/arch/arm/mach-integrator/cpu.c @@ -3,8 +3,6 @@ * * Copyright (C) 2001-2002 Deep Blue Solutions Ltd. * - * $Id: cpu.c,v 1.6 2002/07/18 13:58:51 rmk Exp $ - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. |
