Hand merge

--HG--
extra : convert_revision : 86c7399b79c17558041a73056745227f70fe8b3b

diff --cc arch/alpha/isa_desc
Simple merge

diff --cc arch/isa_parser.py
Simple merge

diff --cc base/traceflags.py
index 1f69e5e88db5210077f84465f2e658a5be1d2979,ef13d9e2a3b19ff4dc4eeb600451c7981c41891e..d1eb4478a6e9b091ffa3f6d674498f43932be9a4
--- 1/base/traceflags.py
--- 2/base/traceflags.py
+++ b/base/traceflags.py
@@@ -154,8 -139,8 +154,9 @@@ compoundFlagMap = 
      'ScsiAll' : [ 'ScsiDisk', 'ScsiCtrl', 'ScsiNone' ],
      'DiskImageAll' : [ 'DiskImage', 'DiskImageRead', 'DiskImageWrite' ],
      'EthernetAll' : [ 'Ethernet', 'EthernetPIO', 'EthernetDMA', 'EthernetData' , 'EthernetDesc', 'EthernetIntr', 'EthernetSM', 'EthernetCksum' ],
 -    'IdeAll' : [ 'IdeCtrl', 'IdeDisk' ]
+     'EthernetNoData' : [ 'Ethernet', 'EthernetPIO', 'EthernetDesc', 'EthernetIntr', 'EthernetSM', 'EthernetCksum' ],
 +    'IdeAll' : [ 'IdeCtrl', 'IdeDisk' ],
 +    'FullCPUAll' : [ 'Fetch', 'Decode', 'Rename', 'IEW', 'Commit', 'IQ', 'ROB', 'FreeList', 'RenameMap', 'LDSTQ', 'StoreSet', 'MemDepUnit', 'DynInst', 'FullCPU']
  }
  
  #############################################################

diff --cc cpu/base_cpu.cc
Simple merge

diff --cc cpu/static_inst.hh
Simple merge