Merge zizzer:/bk/m5

into  zeep.eecs.umich.edu:/z/saidi/work/m5.head

--HG--
extra : convert_revision : 8f463682e32a457cd9171c63dcec5209cb850b56

diff --cc SConscript
Simple merge

diff --cc dev/alpha_console.cc
Simple merge

diff --cc kern/freebsd/freebsd_system.cc
Simple merge

diff --cc kern/kernel_stats.cc
Simple merge

diff --cc kern/linux/linux_system.cc
Simple merge

diff --cc kern/tru64/tru64_system.cc
Simple merge

diff --cc sim/pseudo_inst.cc
Simple merge

diff --cc sim/system.cc
Simple merge