Merge zizzer:/bk/newmem

into  zeep.pool:/tmp/newmem

--HG--
extra : convert_revision : f078a05729b5fe464a06a58bc4adcb374f560572

diff --cc src/arch/x86/miscregfile.cc
index 3d645644ffce5b2736c108653c5723872a37a34c,287655a9759fce86f45f2a482c234bc715be7b16..14ba3c7cce2bf4a73bd8ff5a795f91940113900b
--- 1/src/arch/x86/miscregfile.cc
--- 2/src/arch/x86/miscregfile.cc
+++ b/src/arch/x86/miscregfile.cc
@@@ -100,10 -100,10 +100,10 @@@ string X86ISA::getMiscRegName(RegIndex 
  
  void MiscRegFile::clear()
  {
 -    panic("No misc registers in x86 yet!\n");
 +    //When there are actually misc regs implemented, this will clear them
  }
  
- MiscReg MiscRegFile::readReg(int miscReg)
+ MiscReg MiscRegFile::readRegNoEffect(int miscReg)
  {
      panic("No misc registers in x86 yet!\n");
  }