diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2006-12-01 20:02:30 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2006-12-01 20:02:30 +0100 |
| commit | 701f649aa304e547639fb8bbfdfec0753e9b3b9a (patch) | |
| tree | cf491729e5ca4a222a7fd7fe7205e5157de05f77 /cpu/mpc83xx/traps.c | |
| parent | 5c97aeb8d8b780b10a1cb0beaca196c009f5a62a (diff) | |
| parent | dd520bf314c7add4183c5191692180f576f96b60 (diff) | |
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
Diffstat (limited to 'cpu/mpc83xx/traps.c')
| -rw-r--r-- | cpu/mpc83xx/traps.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/cpu/mpc83xx/traps.c b/cpu/mpc83xx/traps.c index 44345afbfaa..152fa735612 100644 --- a/cpu/mpc83xx/traps.c +++ b/cpu/mpc83xx/traps.c @@ -1,5 +1,8 @@ /* - * linux/arch/ppc/kernel/traps.c + * (C) Copyright 2000 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + * + * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -15,19 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA - * - * Change log: - * - * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) - * - * Modified by Cort Dougan (cort@cs.nmt.edu) - * and Paul Mackerras (paulus@cs.anu.edu.au) - * - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * 20050101: Eran Liberty (liberty@freescale.com) - * Initial file creating (porting from 85XX & 8260) */ /* |