summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2011-06-02 14:36:35 -0700
committerNathan Binkert <nate@binkert.org>2011-06-02 14:36:35 -0700
commitf656787edb2f7f6d95f267fdd91bbcd67f7305ac (patch)
tree24ca6dabcb9b4e1d00b9c99816fb132c96daac1a /src
parent6a1be32a7277c59f13f354bec8ece868043ac0cd (diff)
downloadgem5-f656787edb2f7f6d95f267fdd91bbcd67f7305ac.tar.xz
copyright: clean up copyright blocks
Diffstat (limited to 'src')
-rw-r--r--src/arch/alpha/kgdb.h4
-rw-r--r--src/arch/alpha/remote_gdb.cc4
-rw-r--r--src/arch/arm/remote_gdb.cc4
-rw-r--r--src/arch/generic/debugfaults.hh2
-rw-r--r--src/arch/sparc/remote_gdb.cc4
-rw-r--r--src/arch/x86/insts/badmicroop.cc2
-rw-r--r--src/arch/x86/insts/badmicroop.hh2
-rw-r--r--src/arch/x86/isa/formats/nop.isa2
-rw-r--r--src/base/random_mt.cc2
-rw-r--r--src/base/remote_gdb.cc4
-rw-r--r--src/dev/ide_wdcreg.h4
-rw-r--r--src/dev/sparc/dtod.hh2
-rw-r--r--src/mem/ruby/network/orion/Allocator/Arbiter.cc4
-rw-r--r--src/mem/ruby/network/orion/Allocator/Arbiter.hh4
-rw-r--r--src/mem/ruby/network/orion/Allocator/MatrixArbiter.cc4
-rw-r--r--src/mem/ruby/network/orion/Allocator/MatrixArbiter.hh4
-rw-r--r--src/mem/ruby/network/orion/Allocator/RRArbiter.cc4
-rw-r--r--src/mem/ruby/network/orion/Allocator/RRArbiter.hh4
-rw-r--r--src/mem/ruby/network/orion/Allocator/SWAllocator.cc4
-rw-r--r--src/mem/ruby/network/orion/Allocator/SWAllocator.hh4
-rw-r--r--src/mem/ruby/network/orion/Allocator/VCAllocator.cc4
-rw-r--r--src/mem/ruby/network/orion/Allocator/VCAllocator.hh4
-rw-r--r--src/mem/ruby/network/orion/Buffer/AmpUnit.cc4
-rw-r--r--src/mem/ruby/network/orion/Buffer/AmpUnit.hh4
-rw-r--r--src/mem/ruby/network/orion/Buffer/BitlineUnit.cc4
-rw-r--r--src/mem/ruby/network/orion/Buffer/BitlineUnit.hh4
-rw-r--r--src/mem/ruby/network/orion/Buffer/Buffer.cc4
-rw-r--r--src/mem/ruby/network/orion/Buffer/Buffer.hh4
-rw-r--r--src/mem/ruby/network/orion/Buffer/DecoderUnit.cc4
-rw-r--r--src/mem/ruby/network/orion/Buffer/DecoderUnit.hh4
-rw-r--r--src/mem/ruby/network/orion/Buffer/MemUnit.cc4
-rw-r--r--src/mem/ruby/network/orion/Buffer/MemUnit.hh4
-rw-r--r--src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc4
-rw-r--r--src/mem/ruby/network/orion/Buffer/OutdrvUnit.hh4
-rw-r--r--src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc4
-rw-r--r--src/mem/ruby/network/orion/Buffer/PrechargeUnit.hh4
-rw-r--r--src/mem/ruby/network/orion/Buffer/Register.cc4
-rw-r--r--src/mem/ruby/network/orion/Buffer/Register.hh4
-rw-r--r--src/mem/ruby/network/orion/Buffer/SRAM.cc4
-rw-r--r--src/mem/ruby/network/orion/Buffer/SRAM.hh4
-rw-r--r--src/mem/ruby/network/orion/Buffer/WordlineUnit.cc4
-rw-r--r--src/mem/ruby/network/orion/Buffer/WordlineUnit.hh4
-rw-r--r--src/mem/ruby/network/orion/Clock.cc4
-rw-r--r--src/mem/ruby/network/orion/Clock.hh4
-rw-r--r--src/mem/ruby/network/orion/Crossbar/Crossbar.cc4
-rw-r--r--src/mem/ruby/network/orion/Crossbar/Crossbar.hh4
-rw-r--r--src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.cc4
-rw-r--r--src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.hh4
-rw-r--r--src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.cc4
-rw-r--r--src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.hh4
-rw-r--r--src/mem/ruby/network/orion/FlipFlop.cc4
-rw-r--r--src/mem/ruby/network/orion/FlipFlop.hh4
-rw-r--r--src/mem/ruby/network/orion/OrionLink.cc4
-rw-r--r--src/mem/ruby/network/orion/OrionLink.hh4
-rw-r--r--src/mem/ruby/network/orion/OrionRouter.cc4
-rw-r--r--src/mem/ruby/network/orion/OrionRouter.hh4
-rw-r--r--src/mem/ruby/network/orion/TechParameter.cc4
-rw-r--r--src/mem/ruby/network/orion/TechParameter.hh4
-rw-r--r--src/mem/ruby/network/orion/Type.hh4
-rw-r--r--src/mem/ruby/network/orion/Wire.cc4
-rw-r--r--src/mem/ruby/network/orion/Wire.hh4
-rw-r--r--src/sim/fault_fwd.hh2
-rw-r--r--src/sim/root.cc2
-rw-r--r--src/sim/root.hh2
-rw-r--r--src/unittest/unittest.cc2
-rw-r--r--src/unittest/unittest.hh2
66 files changed, 121 insertions, 121 deletions
diff --git a/src/arch/alpha/kgdb.h b/src/arch/alpha/kgdb.h
index 912cf6d45..0883dc02f 100644
--- 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
diff --git a/src/arch/alpha/remote_gdb.cc b/src/arch/alpha/remote_gdb.cc
index 82fd9c227..a060e49a8 100644
--- 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
diff --git a/src/arch/arm/remote_gdb.cc b/src/arch/arm/remote_gdb.cc
index 1303f6ffc..4060c999a 100644
--- 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
diff --git a/src/arch/generic/debugfaults.hh b/src/arch/generic/debugfaults.hh
index 68bc6c533..3389b0833 100644
--- 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
diff --git a/src/arch/sparc/remote_gdb.cc b/src/arch/sparc/remote_gdb.cc
index 48f0c3e47..712314e01 100644
--- 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
diff --git a/src/arch/x86/insts/badmicroop.cc b/src/arch/x86/insts/badmicroop.cc
index d03a5eba8..d075c8c47 100644
--- 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
diff --git a/src/arch/x86/insts/badmicroop.hh b/src/arch/x86/insts/badmicroop.hh
index 57fe242c4..0185af0d9 100644
--- 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
diff --git a/src/arch/x86/isa/formats/nop.isa b/src/arch/x86/isa/formats/nop.isa
index 73544d907..42d209748 100644
--- 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
diff --git a/src/base/random_mt.cc b/src/base/random_mt.cc
index 6ea54ec03..70a7b0436 100644
--- 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
diff --git a/src/base/remote_gdb.cc b/src/base/remote_gdb.cc
index 01e50824e..980b66bdc 100644
--- 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
diff --git a/src/dev/ide_wdcreg.h b/src/dev/ide_wdcreg.h
index ed7475ec8..f6a59c9f2 100644
--- 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.
diff --git a/src/dev/sparc/dtod.hh b/src/dev/sparc/dtod.hh
index 35dda42dd..325bce90a 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Allocator/Arbiter.cc b/src/mem/ruby/network/orion/Allocator/Arbiter.cc
index a4f480ae5..d6124eb36 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Allocator/Arbiter.hh b/src/mem/ruby/network/orion/Allocator/Arbiter.hh
index cdd4678ec..e9849a901 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Allocator/MatrixArbiter.cc b/src/mem/ruby/network/orion/Allocator/MatrixArbiter.cc
index 13beedb2d..2f7ffcb48 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Allocator/MatrixArbiter.hh b/src/mem/ruby/network/orion/Allocator/MatrixArbiter.hh
index a4a74f25f..a252a960f 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Allocator/RRArbiter.cc b/src/mem/ruby/network/orion/Allocator/RRArbiter.cc
index c30be475a..47963c938 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Allocator/RRArbiter.hh b/src/mem/ruby/network/orion/Allocator/RRArbiter.hh
index e3d392e01..259803a8c 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Allocator/SWAllocator.cc b/src/mem/ruby/network/orion/Allocator/SWAllocator.cc
index 0211d5ea9..f1b5f872d 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Allocator/SWAllocator.hh b/src/mem/ruby/network/orion/Allocator/SWAllocator.hh
index e2982ddf3..fa47df0df 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Allocator/VCAllocator.cc b/src/mem/ruby/network/orion/Allocator/VCAllocator.cc
index 2f3ae2df2..9bc833216 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Allocator/VCAllocator.hh b/src/mem/ruby/network/orion/Allocator/VCAllocator.hh
index c989089fb..81ab6b8a0 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/AmpUnit.cc b/src/mem/ruby/network/orion/Buffer/AmpUnit.cc
index f6be2fe52..cdc36458d 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/AmpUnit.hh b/src/mem/ruby/network/orion/Buffer/AmpUnit.hh
index 30c4cd0ec..78e87469d 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/BitlineUnit.cc b/src/mem/ruby/network/orion/Buffer/BitlineUnit.cc
index 276e481c9..90153d784 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/BitlineUnit.hh b/src/mem/ruby/network/orion/Buffer/BitlineUnit.hh
index ffdb33727..fc37c4298 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/Buffer.cc b/src/mem/ruby/network/orion/Buffer/Buffer.cc
index b46aef6fd..45b836777 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/Buffer.hh b/src/mem/ruby/network/orion/Buffer/Buffer.hh
index cf61bee2b..912151b93 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/DecoderUnit.cc b/src/mem/ruby/network/orion/Buffer/DecoderUnit.cc
index 101efdf5e..e43143240 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/DecoderUnit.hh b/src/mem/ruby/network/orion/Buffer/DecoderUnit.hh
index 2ab32cd7a..c8d66d46c 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/MemUnit.cc b/src/mem/ruby/network/orion/Buffer/MemUnit.cc
index 159bd87fc..cc75ebf9a 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/MemUnit.hh b/src/mem/ruby/network/orion/Buffer/MemUnit.hh
index e2858437e..5393f3890 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc b/src/mem/ruby/network/orion/Buffer/OutdrvUnit.cc
index 07ab5f202..b4679650c 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/OutdrvUnit.hh b/src/mem/ruby/network/orion/Buffer/OutdrvUnit.hh
index 5d01e2c8a..017b3c71a 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc b/src/mem/ruby/network/orion/Buffer/PrechargeUnit.cc
index 9d15843c6..76d257e57 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/PrechargeUnit.hh b/src/mem/ruby/network/orion/Buffer/PrechargeUnit.hh
index e6f56eb3a..533e61a18 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/Register.cc b/src/mem/ruby/network/orion/Buffer/Register.cc
index 933480f1e..5593dbb08 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/Register.hh b/src/mem/ruby/network/orion/Buffer/Register.hh
index 30e8b80f3..d68dd51b8 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/SRAM.cc b/src/mem/ruby/network/orion/Buffer/SRAM.cc
index 00460a32a..f2e580fb7 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/SRAM.hh b/src/mem/ruby/network/orion/Buffer/SRAM.hh
index 959cc8278..ad6b1fdb6 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc b/src/mem/ruby/network/orion/Buffer/WordlineUnit.cc
index f56dc0631..8875d167e 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Buffer/WordlineUnit.hh b/src/mem/ruby/network/orion/Buffer/WordlineUnit.hh
index 4083f5dcf..df6229502 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Clock.cc b/src/mem/ruby/network/orion/Clock.cc
index 303469e0c..500d6580b 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Clock.hh b/src/mem/ruby/network/orion/Clock.hh
index 82a73212d..bf39ecf4b 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Crossbar/Crossbar.cc b/src/mem/ruby/network/orion/Crossbar/Crossbar.cc
index 7bb29a5c7..1ae699d55 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Crossbar/Crossbar.hh b/src/mem/ruby/network/orion/Crossbar/Crossbar.hh
index dc695880d..977387b90 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.cc b/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.cc
index 3e379bac2..e398d9a46 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.hh b/src/mem/ruby/network/orion/Crossbar/MatrixCrossbar.hh
index af08834ac..0a99209f7 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.cc b/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.cc
index 4c610ebaf..00a3f090f 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.hh b/src/mem/ruby/network/orion/Crossbar/MultreeCrossbar.hh
index 6a3395036..dddb2fda4 100644
--- 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
diff --git a/src/mem/ruby/network/orion/FlipFlop.cc b/src/mem/ruby/network/orion/FlipFlop.cc
index 2b44b0fb4..c46b9cc09 100644
--- 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
diff --git a/src/mem/ruby/network/orion/FlipFlop.hh b/src/mem/ruby/network/orion/FlipFlop.hh
index a34e6d987..2596df509 100644
--- 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
diff --git a/src/mem/ruby/network/orion/OrionLink.cc b/src/mem/ruby/network/orion/OrionLink.cc
index c10552d7a..77cb2e9f0 100644
--- 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
diff --git a/src/mem/ruby/network/orion/OrionLink.hh b/src/mem/ruby/network/orion/OrionLink.hh
index 8cdcc945d..892131796 100644
--- 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
diff --git a/src/mem/ruby/network/orion/OrionRouter.cc b/src/mem/ruby/network/orion/OrionRouter.cc
index 579114f3d..e6fc88a78 100644
--- 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
diff --git a/src/mem/ruby/network/orion/OrionRouter.hh b/src/mem/ruby/network/orion/OrionRouter.hh
index f2a8ce52d..38f808aef 100644
--- 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
diff --git a/src/mem/ruby/network/orion/TechParameter.cc b/src/mem/ruby/network/orion/TechParameter.cc
index 5147eaec1..d6c467c58 100644
--- 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
diff --git a/src/mem/ruby/network/orion/TechParameter.hh b/src/mem/ruby/network/orion/TechParameter.hh
index bdebe74bc..af9ba65d4 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Type.hh b/src/mem/ruby/network/orion/Type.hh
index 04fb9cc29..8dbec1e55 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Wire.cc b/src/mem/ruby/network/orion/Wire.cc
index d7333dd19..ba78dd48e 100644
--- 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
diff --git a/src/mem/ruby/network/orion/Wire.hh b/src/mem/ruby/network/orion/Wire.hh
index b16be0d47..2138cc35e 100644
--- 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
diff --git a/src/sim/fault_fwd.hh b/src/sim/fault_fwd.hh
index 998dba195..64ccd4b15 100644
--- 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
diff --git a/src/sim/root.cc b/src/sim/root.cc
index 1102e6a3a..dd7c12077 100644
--- 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
diff --git a/src/sim/root.hh b/src/sim/root.hh
index 76a508c19..3c3b3c2f3 100644
--- 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
diff --git a/src/unittest/unittest.cc b/src/unittest/unittest.cc
index 9c48a9426..36038d6a8 100644
--- 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
diff --git a/src/unittest/unittest.hh b/src/unittest/unittest.hh
index ec5f37838..2e614f178 100644
--- 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