Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5-clean

--HG--
extra : convert_revision : 6fce1b31995cf5c68bd2f4bdfa2b88db6dcd006c

1 files changed, 28 insertions, 0 deletions

diff --git a/arch/alpha/isa_desc b/arch/alpha/isa_desc
index 02b9bfa09..bf7163a1c 100644
--- a/arch/alpha/isa_desc
+++ b/arch/alpha/isa_desc
@@ -1,5 +1,33 @@
 // -*- mode:c++ -*-
 
+//Copyright (c) 2003, 2004, 2005
+//The Regents of The University of Michigan
+//All Rights Reserved
+
+//This code is part of the M5 simulator, developed by Nathan Binkert,
+//Erik Hallnor, Steve Raasch, and Steve Reinhardt, with contributions
+//from Ron Dreslinski, Dave Greene, Lisa Hsu, Ali Saidi, and Andrew
+//Schultz.
+
+//Permission is granted to use, copy, create derivative works and
+//redistribute this software and such derivative works for any purpose,
+//so long as the copyright notice above, this grant of permission, and
+//the disclaimer below appear in all copies made; and so long as the
+//name of The University of Michigan is not used in any advertising or
+//publicity pertaining to the use or distribution of this software
+//without specific, written prior authorization.
+
+//THIS SOFTWARE IS PROVIDED AS IS, WITHOUT REPRESENTATION FROM THE
+//UNIVERSITY OF MICHIGAN AS TO ITS FITNESS FOR ANY PURPOSE, AND WITHOUT
+//WARRANTY BY THE UNIVERSITY OF MICHIGAN OF ANY KIND, EITHER EXPRESS OR
+//IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF
+//MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE REGENTS OF
+//THE UNIVERSITY OF MICHIGAN SHALL NOT BE LIABLE FOR ANY DAMAGES,
+//INCLUDING DIRECT, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+//DAMAGES, WITH RESPECT TO ANY CLAIM ARISING OUT OF OR IN CONNECTION
+//WITH THE USE OF THE SOFTWARE, EVEN IF IT HAS BEEN OR IS HEREAFTER
+//ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
 ////////////////////////////////////////////////////////////////////
 //
 // Alpha ISA description file.