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

--HG--
extra : convert_revision : 0c339eb7574f59665690f7e8457eff0b21e3c4c9

diff --cc SConscript
index b7ca89305f41976219576f1549ea10a05b923cf5,0efb3e1e567ab71fe0c13c3208bf841eb36f237c..bb50f1872928db587f89f777312ba71b994039e3
--- 1/SConscript
--- 2/SConscript
+++ b/SConscript
@@@ -280,23 -293,9 +280,25 @@@ full_system_sources = Split(''
        dev/tsunami_io.cc
        dev/tsunami_pchip.cc
        dev/uart.cc
+       dev/uart8530.cc
+       dev/uart8250.cc
  
 +      encumbered/dev/dma.cc
 +      encumbered/dev/etherdev.cc
 +      encumbered/dev/scsi.cc
 +      encumbered/dev/scsi_ctrl.cc
 +      encumbered/dev/scsi_disk.cc
 +      encumbered/dev/scsi_none.cc
 +      encumbered/dev/tlaser_clock.cc
 +      encumbered/dev/tlaser_ipi.cc
 +      encumbered/dev/tlaser_mbox.cc
 +      encumbered/dev/tlaser_mc146818.cc
 +      encumbered/dev/tlaser_node.cc
 +      encumbered/dev/tlaser_pcia.cc
 +      encumbered/dev/tlaser_pcidev.cc
 +      encumbered/dev/tlaser_serial.cc
 +      encumbered/dev/turbolaser.cc
 +
        kern/kernel_binning.cc
        kern/kernel_stats.cc
        kern/system_events.cc

diff --cc dev/ns_gige.cc
Simple merge

diff --cc dev/tsunami.cc
Simple merge

diff --cc dev/tsunami_cchip.cc
Simple merge

diff --cc dev/tsunami_io.cc
Simple merge

diff --cc dev/tsunami_pchip.cc
Simple merge

diff --cc dev/uart.cc
Simple merge