Merge zizzer.eecs.umich.edu:/bk/m5

into crampon.my.domain:/z/binkertn/research/m5/head

--HG--
extra : convert_revision : b0c9b044b44a1bfc4cded2ebfa240b799dd4a5a0

diff --cc dev/alpha_console.cc
Simple merge

diff --cc dev/baddev.cc
Simple merge

diff --cc dev/ide_disk.cc
Simple merge

diff --cc sim/main.cc
Simple merge