Merge zed.eecs.umich.edu:/.automount/fox/y/mserrano/m5_new/m5
authorBenjamin Nash <benash@umich.edu>
Thu, 28 Jul 2005 17:16:45 +0000 (13:16 -0400)
committerBenjamin Nash <benash@umich.edu>
Thu, 28 Jul 2005 17:16:45 +0000 (13:16 -0400)
into  zed.eecs.umich.edu:/z/benash/bk/m5

SConscript:
dev/ide_disk.hh:
    Formatting.
dev/ide_ctrl.cc:
    Endianness
dev/ide_disk.cc:
dev/pcidev.cc:
dev/tsunami_io.cc:
dev/uart8250.cc:
    Clean up code.

--HG--
extra : convert_revision : cb554f0e3a701371d2106cd7e11a4a22f773acc2

1  2 
kern/freebsd/freebsd_system.cc
kern/freebsd/freebsd_system.hh

Simple merge
Simple merge