Merge ktlim@zizzer:/bk/newmem

into  zizzer.eecs.umich.edu:/.automount/zamp/z/ktlim2/clean/newmem

--HG--
extra : convert_revision : 1d2f499bdc6e21c658a9262da1c8d27d6b74cafe

5 files changed, 12 insertions, 0 deletions

diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py
index 06875d1f0..c44a9ad1f 100644
--- a/src/python/m5/__init__.py
+++ b/src/python/m5/__init__.py
@@ -23,6 +23,9 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Nathan Binkert
+#          Steve Reinhardt
 
 import sys, os, time
 
diff --git a/src/python/m5/config.py b/src/python/m5/config.py
index ce7e5a964..d1471c807 100644
--- a/src/python/m5/config.py
+++ b/src/python/m5/config.py
@@ -23,6 +23,9 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Steve Reinhardt
+#          Nathan Binkert
 
 from __future__ import generators
 import os, re, sys, types, inspect
diff --git a/src/python/m5/convert.py b/src/python/m5/convert.py
index 73181e985..580a579bc 100644
--- a/src/python/m5/convert.py
+++ b/src/python/m5/convert.py
@@ -23,6 +23,8 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Nathan Binkert
 
 # metric prefixes
 exa  = 1.0e18
diff --git a/src/python/m5/multidict.py b/src/python/m5/multidict.py
index fd40ebbbd..698e85b26 100644
--- a/src/python/m5/multidict.py
+++ b/src/python/m5/multidict.py
@@ -23,6 +23,8 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Nathan Binkert
 
 __all__ = [ 'multidict' ]
 
diff --git a/src/python/m5/smartdict.py b/src/python/m5/smartdict.py
index cd38d7326..d85dbd517 100644
--- a/src/python/m5/smartdict.py
+++ b/src/python/m5/smartdict.py
@@ -23,6 +23,8 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Nathan Binkert
 
 # The SmartDict class fixes a couple of issues with using the content
 # of os.environ or similar dicts of strings as Python variables: