Fix another merge issue
authorRon Dreslinski <rdreslin@umich.edu>
Tue, 10 Oct 2006 06:00:37 +0000 (02:00 -0400)
committerRon Dreslinski <rdreslin@umich.edu>
Tue, 10 Oct 2006 06:00:37 +0000 (02:00 -0400)
commit89e80ccc203891f056a587b777fde9efddaba18f
tree21e436ccf0d25b4a3b14e916b82fe60a9a7c1874
parenta0472af008bd13d8a4850ef67b0ef08d37cfb8f8
Fix another merge issue

--HG--
extra : convert_revision : 2b33da5e8578ea6a8bdd2d89f183c2e6b942b0fc
src/mem/packet.hh