successful merge, linux still builds and runs as far it used to, network device still...
authorLisa Hsu <hsul@eecs.umich.edu>
Wed, 12 May 2004 02:42:45 +0000 (22:42 -0400)
committerLisa Hsu <hsul@eecs.umich.edu>
Wed, 12 May 2004 02:42:45 +0000 (22:42 -0400)
commit16800971d03a1b57339cd9ebdb5cee7711078c51
tree730e2c35880d42d0b2253824bc9345526fe0f7ad
parenta5f90eba3bd2d96c6733a6ac9e8d03a9297fae6a
successful merge, linux still builds and runs as far it used to, network device still transmit ARP packet.

arch/alpha/alpha_memory.cc:
    change to the main m5 tree convention for naming
base/traceflags.py:
    add ide and pciconfigall traceflags
kern/linux/linux_system.cc:
kern/linux/linux_system.hh:
    kill some old binning styled stuff

--HG--
extra : convert_revision : 0558878906817975a714b1c7c08f9ee405468535
arch/alpha/alpha_memory.cc
base/traceflags.py
kern/linux/linux_system.cc
kern/linux/linux_system.hh