fix lisa's hand merge
authorAli Saidi <saidi@eecs.umich.edu>
Sat, 9 Dec 2006 23:27:54 +0000 (18:27 -0500)
committerAli Saidi <saidi@eecs.umich.edu>
Sat, 9 Dec 2006 23:27:54 +0000 (18:27 -0500)
commit4947bf276eaa19d33c1af0bd0843dc23192fdd19
tree916e2f9ffa6e03d53637b5f801c197bc2b2b8c90
parent2eef266c4587906601ab40b611695e781c4945dc
fix lisa's hand merge

--HG--
extra : convert_revision : d25604156ae0b2cf29d92fb960b8f5d77427985b
src/arch/sparc/ua2005.cc