diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2006-06-17 18:12:44 -0400 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2006-06-17 18:12:44 -0400 |
| commit | cd6da4569e9c6ed86357cfcf4eed53535c713e02 (patch) | |
| tree | b603bfae638a3e400719b9fb81f4f791239ab4c8 /src/sim | |
| parent | 8a1298822182c0ca01caddaa539bdb6a53927e57 (diff) | |
| parent | e76a12834b7badeba86300b419cb5bd5fc911495 (diff) | |
| download | gem5-cd6da4569e9c6ed86357cfcf4eed53535c713e02.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into iceaxe.:/Volumes/work/research/m5/newmem
--HG--
extra : convert_revision : 915088112b7b8c3e2182b188ae832b587dd79386
Diffstat (limited to 'src/sim')
| -rw-r--r-- | src/sim/serialize.cc | 3 | ||||
| -rw-r--r-- | src/sim/serialize.hh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/sim/serialize.cc b/src/sim/serialize.cc index 07e3b8a56..0e3139116 100644 --- a/src/sim/serialize.cc +++ b/src/sim/serialize.cc @@ -25,7 +25,8 @@ * (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: Erik Hallnor + * Authors: Nathan Binkert + * Erik Hallnor * Steve Reinhardt */ diff --git a/src/sim/serialize.hh b/src/sim/serialize.hh index 1bcb235e6..64ed6142f 100644 --- a/src/sim/serialize.hh +++ b/src/sim/serialize.hh @@ -25,7 +25,8 @@ * (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: Erik Hallnor + * Authors: Nathan Binkert + * Erik Hallnor * Steve Reinhardt */ |