copyright: clean up copyright blocks

diff --git a/src/arch/alpha/kgdb.h b/src/arch/alpha/kgdb.h
index 912cf6d450216fe2097f0e3203ff56fdd21514d7..0883dc02f7313d55965b13723618fed28e8fbfbc 100644 (file)
--- 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 82fd9c2276352f830fafd7a3aa3b3fd1de92aba0..a060e49a89a8781fc23e41e68b7feab6fc22362f 100644 (file)
--- 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 1303f6ffc1746cd08438929a5fed92ba7303e293..4060c999abfd09355971c246e05b693ba591102d 100644 (file)
--- 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 68bc6c5330c57ac639c26a8f3a46c5968cf401b6..3389b08336ec03fb2cb6ba66b796aaf74a7560c5 100644 (file)
--- 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 48f0c3e47bac9ee825ab3a4e373ef0b7bb3ae3ba..712314e013e244501191bc4e6f217b5fee7bf528 100644 (file)
--- 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 d03a5eba83a0e16037f7eed1400a26d4d8e7a2e5..d075c8c47363b3fbbd4c8299fa2da82dbf9fe9e4 100644 (file)
--- 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 57fe242c4984f8cf596581046beaff75e52c2a9d..0185af0d927b0840b2079b34ef223e590e542e52 100644 (file)
--- 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 73544d9076a552ea306e6f49d8f7908884b42e27..42d2097482fec3b876da1fb0f0d9c34a550c246a 100644 (file)
--- 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 6ea54ec0324ae2383b6c0aecf9a5bb847a307e5f..70a7b0436e3b9427cb031b9e48b401277b856038 100644 (file)
--- 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 01e50824eceee9df3b545be33dd6fbecac8b0b09..980b66bdce9eb3a6a439cd6da4884a9abb2ebe01 100644 (file)
--- 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 ed7475ec875d98315847432637b2689b4adac405..f6a59c9f2bd23f0e0a4f7dbb823c310109367ba2 100644 (file)
--- 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 35dda42dd1e178e8bea434c29a87b83a784c3a16..325bce90a1f61c3050fdf5abed4f675ac0942b7c 100644 (file)
--- 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 a4f480ae587174d96cfa3ba1994d6c391109a589..d6124eb366a0763ab6d5e7d292ca8e3cf0d4b391 100644 (file)
--- 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 cdd4678ec0e2226a0ee8c5e3590931d7426dd4a4..e9849a901b28e3936ffcea67c95a2e6baa9939e0 100644 (file)
--- 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 13beedb2dfc502254fa1121d96f06a25dcb74ca1..2f7ffcb4884c40e843b6202dec3a9821497773a2 100644 (file)
--- 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 a4a74f25f41d6f1719f3abb6b68da98a1e790257..a252a960f7deb2769b935f56784954e585ff59cc 100644 (file)
--- 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 c30be475a40c995e8ebdbaa6f1c45191d0a61d44..47963c938de0a306f3b7cb2655f9cf8ee53c59b2 100644 (file)
--- 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 e3d392e0116c6e77882c28f77e050f3763b97172..259803a8c1ad5b20bc4662bfb60d6fc30f0b7d2a 100644 (file)
--- 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 0211d5ea9ee8e092e71b29cb1b5b538156347742..f1b5f872d17edd1acf8ae2eb8ba9207cc0804185 100644 (file)
--- 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 e2982ddf356663d37394b47ce563629a17c97db0..fa47df0dfc3b271aa883b3e052e08227d21f14e4 100644 (file)
--- 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 2f3ae2df26d34bcf65c660d1a81656fce34bf3d3..9bc8332166e1cc63ceadd083446d442c536d1888 100644 (file)
--- 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 c989089fb4150fb4fc85d0b50df6277a07b0221b..81ab6b8a0e87ab86433fbaceabc6f489fe261fef 100644 (file)
--- 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 f6be2fe52d295e924614ac09d0b8b4948705dcc0..cdc36458dab456ca89563ff71a19552eb538f2b8 100644 (file)
--- 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 30c4cd0ec5d0833e8031f70761858b75686a9cc7..78e87469d3444d4f1d07b86e8c8c3a12a2e771c7 100644 (file)
--- 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 276e481c9f75a7b8386349d2b88c774b4ee7ee1d..90153d78400fd1f8b2d837c13d442dd3899f90b1 100644 (file)
--- 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 ffdb337273970d2132d44dc67866852c504e0e0e..fc37c42981472fca6482fbfe5355882bed4c2ded 100644 (file)
--- 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 b46aef6fdbef1b7e1b3a3bb562d9de6c59732778..45b836777a505c55d45cdee4f93d4b5605bd3014 100644 (file)
--- 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 cf61bee2b280c104d5edfe8a709595f701b472d5..912151b9362d66087f952abcf60b527b221baeca 100644 (file)
--- 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 101efdf5e3bab5634e640ddbdcca70508eb9273f..e431432408ab27df702b32d28243069cc953b3f8 100644 (file)
--- 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 2ab32cd7a55353727d094a68c1e3a32c80c947c7..c8d66d46cc101cfe03e50271df36650ba394976a 100644 (file)
--- 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 159bd87fc8cde6bd1d212b4cf5e30cfe5ba3385c..cc75ebf9ac1e9f0ef2a99fd2464fb303ec81a498 100644 (file)
--- 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 e2858437e2198418b81c055aeb05e4e57ddad312..5393f3890c3de352a42061fd63cc42bca7952a39 100644 (file)
--- 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 07ab5f20223f61291e59d684ed875a1c66f20f30..b4679650c61c26ad93c4d404a92c87a2fa9eb6db 100644 (file)
--- 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 5d01e2c8a2dd055e451256b3f5cabc9de28fe99d..017b3c71ad97d5e56e1a663a39120cd9399e1cee 100644 (file)
--- 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 9d15843c62721906def15253c394d735a16661a3..76d257e576841b79ac5d56741087820501ce8474 100644 (file)
--- 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 e6f56eb3aa25176926633e6ee4ceb0267d8e99ce..533e61a18b6f0d02bab5ed6099b7e7d21d9d45fa 100644 (file)
--- 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 933480f1e58cf7a7488fea04ccf2430f23b2a58d..5593dbb08284fe546dddf23a4e89e0479d2f50dd 100644 (file)
--- 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 30e8b80f3d97e215f3b633a8573503550adf0d60..d68dd51b8973d54b49b6cd18172de71b2f133adb 100644 (file)
--- 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 00460a32a7d28a07e8482aa502b3cce0d86a1396..f2e580fb70f20ba993fea85d8cb17bed2ebdcecf 100644 (file)
--- 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 959cc82788ac14408bb0d6a5e47e6fd59f2a3d27..ad6b1fdb6cf6edf21bae6a9bde7c5843cbe04be4 100644 (file)
--- 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 f56dc06311151dc1e422b2fef7469f3294138f07..8875d167eb57eef835e171726ee31212d85dd541 100644 (file)
--- 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 4083f5dcfdde4459cae183964c0667add75cb7d5..df622950292f9bc64a383388c5ad70e045264e93 100644 (file)
--- 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 303469e0c2f7a4da2203155652bb5f8640faa644..500d6580b60cd77562d57420a8ed314f2eedc4db 100644 (file)
--- 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 82a73212d16d90139f4d2ce0cba6e1446a108246..bf39ecf4b91e88f30f993ea15a115d9d94dad69c 100644 (file)
--- 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 7bb29a5c763d45cff9695a2c4528baab8f7dd3d7..1ae699d55e8367783bf408026fa0dca49f66cd84 100644 (file)
--- 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 dc695880da8a3bf703a26dbdd1381ea291903ad7..977387b9048c9189b9429398b273a7efa14207f3 100644 (file)
--- 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 3e379bac268cf134e01f004d4d00612e31de1dcd..e398d9a4609bd7bd23b984124be177a74aa581cf 100644 (file)
--- 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 af08834ac8fc11bb3e379a92f91f0fc41da51b40..0a99209f731f198733fff508dc76c98398e8afac 100644 (file)
--- 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 4c610ebafbba3b9812a9642e6fefa479db0cceec..00a3f090f51275973df0cd3ddaa17e368ff6e29e 100644 (file)
--- 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 6a339503628eaf8074bad0206e2a1fe752468a7d..dddb2fda448c1c72751eb7ea2847b15822d144b1 100644 (file)
--- 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 2b44b0fb42a7989296c30a4f13f208b06e645959..c46b9cc09cbf9b9119e17d19539d4f4b1ffbd1ca 100644 (file)
--- 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 a34e6d987edc28843338147c10ed31ebfa554a5b..2596df5093cf3fecedf272f544fd0b84cd86a19d 100644 (file)
--- 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 c10552d7a1275fc454653df25532619eb08df377..77cb2e9f0b1e8970ea52dfeb72a2155c63f13652 100644 (file)
--- 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 8cdcc945d4c1a92b6ae406eba5dd165ba26fd137..892131796310fc84d76c1db960ec3de53236c21d 100644 (file)
--- 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 579114f3d895e7b46ae92041f49f23c6a1eec906..e6fc88a78533302fe86f738245a1ab1ce5e6f876 100644 (file)
--- 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 f2a8ce52d534c34a16834885a8f0c0ffa7b12c72..38f808aef373f917ce00fc474bb434c9068a880c 100644 (file)
--- 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 5147eaec1339d1a109d3393e61427e7a80bfce0c..d6c467c5886361dc79aeb9ee45b8694e2c466bd7 100644 (file)
--- 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 bdebe74bcada6bb70db78fa0ba4c77c2b200a23e..af9ba65d47bbdd50b442124c16415bffeade376f 100644 (file)
--- 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 04fb9cc296e0b9e1408352e7898fc0f31a148436..8dbec1e55f63c22aa80294cdd688354ec21b14b9 100644 (file)
--- 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 d7333dd19ceb401c1f6be2c71002a2bb9d56860e..ba78dd48e2837edd12b36bfba9a16e7e0be1df7a 100644 (file)
--- 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 b16be0d4724858f8f09c624d0bb14bf6dc0c3c57..2138cc35e76511ff5242edc1abad20cc4a9ebbb8 100644 (file)
--- 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 998dba1950f80edfde7341c942444fcb68f58c52..64ccd4b15eca84117b52f07e8c68a7bb28446710 100644 (file)
--- 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 1102e6a3ad6a2abf0270e0d7619f1e7beb7954ef..dd7c1207711fa822ae84dc346d127a2d0897a796 100644 (file)
--- 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 76a508c19482201e5770501cee1e6f65adf9dd29..3c3b3c2f3622a734a0cb482cb6f15f7c841737cf 100644 (file)
--- 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 9c48a9426e6bcd2f669bc06fa8367e67737c1efd..36038d6a88257ecfaf24d1f1d3b34d6d05ce6808 100644 (file)
--- 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 ec5f378382cf461bd5ec4e4544560ce8ac7f3eb1..2e614f1783eba98b1002d44c23eabf84bdfae97f 100644 (file)
--- 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