Fixed up after a hand merge.
authorGabe Black <gblack@eecs.umich.edu>
Tue, 14 Mar 2006 21:39:59 +0000 (16:39 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 14 Mar 2006 21:39:59 +0000 (16:39 -0500)
commit78b9a789d7adf69a82535b93f8822f8adaca3f7e
tree8e70f79cde33c312fcfd56e3d53ca7633f6fca1f
parentfa763d2ecfae16e84a9f9d689d19f746d84d08e3
Fixed up after a hand merge.

arch/alpha/utility.hh:
    Got rid of unnecessary extern and static qualifiers, and fixed up the hand merge.
arch/sparc/regfile.hh:
    Fixed up SPARC after a hand merge.

--HG--
extra : convert_revision : 56e2d90ddd144f3386dbea50fa96cfc461d46b81
arch/alpha/utility.hh
arch/sparc/regfile.hh