Merge zizzer:/bk/m5
authorAli Saidi <saidi@eecs.umich.edu>
Fri, 3 Mar 2006 19:25:26 +0000 (14:25 -0500)
committerAli Saidi <saidi@eecs.umich.edu>
Fri, 3 Mar 2006 19:25:26 +0000 (14:25 -0500)
commit9ad917858763bb44c8e6e22b7bb370fd50d518df
treeeac667084b6627aaca784aa2061256a5750726ab
parent7546fabe68a1dc6ec9b9e020f5e2b1cc0aa31c21
parent0bf25c595364f7ca9b5e632c84fcf0d35dc3490a
Merge zizzer:/bk/m5
into  zeep.eecs.umich.edu:/z/saidi/work/m5.head

--HG--
extra : convert_revision : 8f463682e32a457cd9171c63dcec5209cb850b56
SConscript
dev/alpha_console.cc
kern/freebsd/freebsd_system.cc
kern/kernel_stats.cc
kern/linux/linux_system.cc
kern/tru64/tru64_system.cc
sim/pseudo_inst.cc
sim/system.cc