summary refs log tree commit diff stats
path: root/hw/usb/dev-network.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-01-31 19:37:33 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2013-01-31 19:37:33 -0600
commit8a55ebf01507ab73cc458cfcd5b9cb856aba0b9e (patch)
tree3911782dacfae1ce19cd8eaaedcf1629e17e6d51 /hw/usb/dev-network.c
parent2854c549e84532f0b76b7884f1903da8a1bf4dbb (diff)
parent77868120cfe93ad7816dfac6546684e5a6c6e256 (diff)
downloadfocaccia-qemu-8a55ebf01507ab73cc458cfcd5b9cb856aba0b9e.tar.gz
focaccia-qemu-8a55ebf01507ab73cc458cfcd5b9cb856aba0b9e.zip
Merge remote-tracking branch 'afaerber/qom-cpu' into staging
# By Andreas Färber
# Via Andreas Färber
* afaerber/qom-cpu:
  linux-user: bsd-user: Don't reset X86CPU twice
  target-i386: Pass X86CPU to cpu_x86_set_a20()
  target-unicore32: Rename CPU subtypes
  target-openrisc: Rename CPU subtypes
  target-openrisc: TYPE_OPENRISC_CPU should be abstract
  target-m68k: Rename CPU subtypes
  target-m68k: Mark as unmigratable
  target-s390x: Mark as unmigratable
  target-sh4: Mark as unmigratable
  target-xtensa: Mark as unmigratable
  target-microblaze: Mark as unmigratable
  target-unicore32: Mark as unmigratable
  ide/mmio: QOM'ify MMIO IDE for R2D
Diffstat (limited to 'hw/usb/dev-network.c')
0 files changed, 0 insertions, 0 deletions