diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2006-06-17 18:44:42 -0400 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-06-17 18:44:42 -0400 |
commit | e5d20ad48e6811090f67961efb9cf615a6371bb3 (patch) | |
tree | c0f1db64ee37263572246ae96df5d556e7b96385 /src/kern/system_events.hh | |
parent | 174f7753ae8b5d5c856f262e770e3184f37077ea (diff) | |
parent | 989562bed9fb5e8b11c178e33acab07fb64f7bcd (diff) | |
download | gem5-e5d20ad48e6811090f67961efb9cf615a6371bb3.tar.xz |
Merge zizzer:/bk/newmem
into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : 9b628a0ee157657ac76c3a9455108d033c125822
Diffstat (limited to 'src/kern/system_events.hh')
-rw-r--r-- | src/kern/system_events.hh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/kern/system_events.hh b/src/kern/system_events.hh index ccd6bd9a4..93b5eb528 100644 --- a/src/kern/system_events.hh +++ b/src/kern/system_events.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: Lisa Hsu + * Authors: Nathan Binkert + * Lisa Hsu * Ali Saidi */ |