Merge zizzer:/bk/m5
authorAli Saidi <saidi@eecs.umich.edu>
Sun, 19 Feb 2006 05:47:45 +0000 (00:47 -0500)
committerAli Saidi <saidi@eecs.umich.edu>
Sun, 19 Feb 2006 05:47:45 +0000 (00:47 -0500)
commit14f2cdb1a14e9e6896939c210cdacef289d9c263
treecdf7705980fb776a518d40e4fa3869fc0bead2cf
parenta611b8100379e28728c1084801413954c973e734
parent00d58aeb4dc0569bc3d1273d90867148e6500ad9
Merge zizzer:/bk/m5
into  pb15.local:/Users/ali/work/m5.head

--HG--
extra : convert_revision : 774e4afbb0f9c3ae62843138b6d7195ea184ff92
SConscript
sim/syscall_emul.cc
sim/syscall_emul.hh