Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5-smp

--HG--
extra : convert_revision : 59173b5d4599cfe1cbaa96705e9731ee5a8d8647

diff --cc dev/ide_ctrl.cc
Simple merge

diff --cc dev/ide_disk.cc
Simple merge

diff --cc dev/ns_gige.cc
Simple merge

diff --cc dev/tsunami.hh
Simple merge