copyright: clean up copyright blocks

2011-06-02 14:36:35 -07:00 · 2011-06-02 14:36:35 -07:00 · f656787edb
parent 6a1be32a72
commit f656787edb
66 changed files with 121 additions and 121 deletions
--- a/src/arch/alpha/kgdb.h
+++ b/src/arch/alpha/kgdb.h
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1992, 1993 The Regents of the University of California
+ * All rights reserved.
 *
 * This software was developed by the Computer Systems Engineering group
 * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
--- a/src/arch/alpha/remote_gdb.cc
+++ b/src/arch/alpha/remote_gdb.cc
@ -29,8 +29,8 @@
 */

 /*
- * Copyright (c) 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1990, 1993 The Regents of the University of California
+ * All rights reserved.
 *
 * This software was developed by the Computer Systems Engineering group
 * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
--- a/src/arch/arm/remote_gdb.cc
+++ b/src/arch/arm/remote_gdb.cc
@ -42,8 +42,8 @@
 */

 /*
- * Copyright (c) 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1990, 1993 The Regents of the University of California
+ * All rights reserved
 *
 * This software was developed by the Computer Systems Engineering group
 * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
--- a/src/arch/generic/debugfaults.hh
+++ b/src/arch/generic/debugfaults.hh
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Advanced Micro Devices
+ * Copyright (c) 2010 Advanced Micro Devices, Inc.
 * All rights reserved.
 *
 * The license below extends only to copyright in the software and shall
--- a/src/arch/sparc/remote_gdb.cc
+++ b/src/arch/sparc/remote_gdb.cc
@ -29,8 +29,8 @@
 */

 /*
- * Copyright (c) 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1990, 1993 The Regents of the University of California
+ * All rights reserved
 *
 * This software was developed by the Computer Systems Engineering group
 * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
--- a/src/arch/x86/insts/badmicroop.cc
+++ b/src/arch/x86/insts/badmicroop.cc
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Advanced Micro Devices
+ * Copyright (c) 2011 Advanced Micro Devices, Inc.
 * All rights reserved.
 *
 * The license below extends only to copyright in the software and shall
--- a/src/arch/x86/insts/badmicroop.hh
+++ b/src/arch/x86/insts/badmicroop.hh
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Advanced Micro Devices
+ * Copyright (c) 2011 Advanced Micro Devices, Inc.
 * All rights reserved.
 *
 * The license below extends only to copyright in the software and shall
--- a/src/arch/x86/isa/formats/nop.isa
+++ b/src/arch/x86/isa/formats/nop.isa
@ -1,6 +1,6 @@
 // -*- mode:c++ -*-

-// Copyright (c) 2010 Advanced Micro Devices
+// Copyright (c) 2010 Advanced Micro Devices, Inc.
 // All rights reserved.
 //
 // The license below extends only to copyright in the software and shall
--- a/src/base/random_mt.cc
+++ b/src/base/random_mt.cc
@ -5,7 +5,7 @@
 * Before using, initialize the state by using init_genrand(seed)
 * or init_by_array(init_key, key_length).
 *
- * Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+ * Copyright (C) 1997-2002 Makoto Matsumoto and Takuji Nishimura
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/base/remote_gdb.cc
+++ b/src/base/remote_gdb.cc
@ -29,8 +29,8 @@
 */

 /*
- * Copyright (c) 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1990, 1993 The Regents of the University of California
+ * All rights reserved
 *
 * This software was developed by the Computer Systems Engineering group
 * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
--- a/src/dev/ide_wdcreg.h
+++ b/src/dev/ide_wdcreg.h
@ -2,8 +2,8 @@
 /*	$NetBSD: wdcreg.h,v 1.22 1999/03/07 14:02:54 bouyer Exp $	*/

 /*-
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1991 The Regents of the University of California
+ * All rights reserved
 *
 * This code is derived from software contributed to Berkeley by
 * William Jolitz.
--- a/src/dev/sparc/dtod.hh
+++ b/src/dev/sparc/dtod.hh
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 206, 2004-2005 The Regents of The University of Michigan
+ * Copyright (c) 2004-2006 The Regents of The University of Michigan
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Allocator/Arbiter.cc
+++ b/src/mem/ruby/network/orion/Allocator/Arbiter.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Allocator/Arbiter.hh
+++ b/src/mem/ruby/network/orion/Allocator/Arbiter.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Allocator/MatrixArbiter.cc
+++ b/src/mem/ruby/network/orion/Allocator/MatrixArbiter.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Allocator/MatrixArbiter.hh
+++ b/src/mem/ruby/network/orion/Allocator/MatrixArbiter.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Allocator/RRArbiter.cc
+++ b/src/mem/ruby/network/orion/Allocator/RRArbiter.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Allocator/RRArbiter.hh
+++ b/src/mem/ruby/network/orion/Allocator/RRArbiter.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Allocator/SWAllocator.cc
+++ b/src/mem/ruby/network/orion/Allocator/SWAllocator.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Allocator/SWAllocator.hh
+++ b/src/mem/ruby/network/orion/Allocator/SWAllocator.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Allocator/VCAllocator.cc
+++ b/src/mem/ruby/network/orion/Allocator/VCAllocator.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Allocator/VCAllocator.hh
+++ b/src/mem/ruby/network/orion/Allocator/VCAllocator.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/AmpUnit.cc
+++ b/src/mem/ruby/network/orion/Buffer/AmpUnit.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/AmpUnit.hh
+++ b/src/mem/ruby/network/orion/Buffer/AmpUnit.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/BitlineUnit.cc
+++ b/src/mem/ruby/network/orion/Buffer/BitlineUnit.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/BitlineUnit.hh
+++ b/src/mem/ruby/network/orion/Buffer/BitlineUnit.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/Buffer.cc
+++ b/src/mem/ruby/network/orion/Buffer/Buffer.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/Buffer.hh
+++ b/src/mem/ruby/network/orion/Buffer/Buffer.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/DecoderUnit.cc
+++ b/src/mem/ruby/network/orion/Buffer/DecoderUnit.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/DecoderUnit.hh
+++ b/src/mem/ruby/network/orion/Buffer/DecoderUnit.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/MemUnit.cc
+++ b/src/mem/ruby/network/orion/Buffer/MemUnit.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/MemUnit.hh
+++ b/src/mem/ruby/network/orion/Buffer/MemUnit.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc
+++ b/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/OutdrvUnit.hh
+++ b/src/mem/ruby/network/orion/Buffer/OutdrvUnit.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc
+++ b/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/PrechargeUnit.hh
+++ b/src/mem/ruby/network/orion/Buffer/PrechargeUnit.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/Register.cc
+++ b/src/mem/ruby/network/orion/Buffer/Register.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/Register.hh
+++ b/src/mem/ruby/network/orion/Buffer/Register.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/SRAM.cc
+++ b/src/mem/ruby/network/orion/Buffer/SRAM.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/SRAM.hh
+++ b/src/mem/ruby/network/orion/Buffer/SRAM.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc
+++ b/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Buffer/WordlineUnit.hh
+++ b/src/mem/ruby/network/orion/Buffer/WordlineUnit.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Clock.cc
+++ b/src/mem/ruby/network/orion/Clock.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Clock.hh
+++ b/src/mem/ruby/network/orion/Clock.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and 
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Crossbar/Crossbar.cc
+++ b/src/mem/ruby/network/orion/Crossbar/Crossbar.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Crossbar/Crossbar.hh
+++ b/src/mem/ruby/network/orion/Crossbar/Crossbar.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.cc
+++ b/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.hh
+++ b/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.cc
+++ b/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.hh
+++ b/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/FlipFlop.cc
+++ b/src/mem/ruby/network/orion/FlipFlop.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/FlipFlop.hh
+++ b/src/mem/ruby/network/orion/FlipFlop.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/OrionLink.cc
+++ b/src/mem/ruby/network/orion/OrionLink.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/OrionLink.hh
+++ b/src/mem/ruby/network/orion/OrionLink.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/OrionRouter.cc
+++ b/src/mem/ruby/network/orion/OrionRouter.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/OrionRouter.hh
+++ b/src/mem/ruby/network/orion/OrionRouter.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/TechParameter.cc
+++ b/src/mem/ruby/network/orion/TechParameter.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/TechParameter.hh
+++ b/src/mem/ruby/network/orion/TechParameter.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Type.hh
+++ b/src/mem/ruby/network/orion/Type.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Wire.cc
+++ b/src/mem/ruby/network/orion/Wire.cc
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/mem/ruby/network/orion/Wire.hh
+++ b/src/mem/ruby/network/orion/Wire.hh
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2009 Princeton University, and
- *                    Regents of the University of California
+ * Copyright (c) 2009 Princeton University
+ * Copyright (c) 2009 The Regents of the University of California
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/sim/fault_fwd.hh
+++ b/src/sim/fault_fwd.hh
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Advanced Micro Devices
+ * Copyright (c) 2010 Advanced Micro Devices, Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/sim/root.cc
+++ b/src/sim/root.cc
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2002-2005 The Regents of The University of Michigan
- * Copyright (c) 2011 Advanced Micro Devices
+ * Copyright (c) 2011 Advanced Micro Devices, Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/sim/root.hh
+++ b/src/sim/root.hh
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Advanced Micro Devices
+ * Copyright (c) 2011 Advanced Micro Devices, Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/unittest/unittest.cc
+++ b/src/unittest/unittest.cc
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Advanced Micro Devices
+ * Copyright (c) 2011 Advanced Micro Devices, Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/src/unittest/unittest.hh
+++ b/src/unittest/unittest.hh
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Advanced Micro Devices
+ * Copyright (c) 2011 Advanced Micro Devices, Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without