Merge
authorNathan Binkert <binkertn@umich.edu>
Fri, 30 Jan 2004 21:01:26 +0000 (16:01 -0500)
committerNathan Binkert <binkertn@umich.edu>
Fri, 30 Jan 2004 21:01:26 +0000 (16:01 -0500)
commit4ae64216c3c27e9f1e35ce93114f932f3d2c3361
treefe3ca24667628af7c2e5a94a3bcae585fb492855
parenta0c3e61d320e72bbdddf4cea1413f6638e0faf45
parent2f4f7aacf77dea16795a4052613da6092f6efc31
Merge

--HG--
extra : convert_revision : 8690e31b64235874d74ea4a1123a408610fb115b
base/loader/elf_object.cc
dev/alpha_console.cc
dev/console.cc