Merge

dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
dev/tsunami_uart.cc:
    SCCS merged

--HG--
extra : convert_revision : da3d1998d6dd39e0d3f8754074c513cdd8a4193c

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/tsunami_uart.cc
index 9e7207d9c1cedf9e77faf87f3688aa49b5f19e42,4b9e7a76bb12bf29b8011d174c1b40c3b5e007bd..6f15c5ee0b04cc047d61752b48ba3d66d97f9e6d
--- 1/dev/tsunami_uart.cc
--- 2/dev/tsunami_uart.cc
+++ b/dev/tsunami_uart.cc
@@@ -118,8 -116,7 +118,7 @@@ TsunamiUart::read(MemReqPtr &req, uint8
          else
              *data = 0;
          return No_Fault;
 -      case 0xA:
 +      case 0x2:
-         //*data = 2<<6; // This means a 8250 serial port, do we want a 16550?
          *data = 0; // This means a 8250 serial port, do we want a 16550?
          return No_Fault;
      }