tree 0c760fff969c2d4ae462d40569068321b1fc5d06
parent fafd46eff229834a15496051acb8880848fcd8eb
parent 35bfc7324e2e6946c4113ada5db30553a1a7c40b
author Avi Kivity <avi@redhat.com> 1259843407 +0200
committer Avi Kivity <avi@redhat.com> 1259843407 +0200

Merge commit 'v0.11.1' into stable-0.11

* commit 'v0.11.1':
  Update version and changelog for 0.11.1 release
  fix I2C slave addressing
  Revert "vga: do not resize the screen on hw_invalidate"
  slirp: fix use-after-free
  Fix sparc.ld
  ELF codedump build failures
  kvm: Move KVM mp_state accessors to i386-specific code
  this patch fixes a typo where armv4l was incorrectly spelled arm4l,
  net: disable draining tap queue in one go
  pcnet: Restart poll timer on pcnet_start
  Sparc32: Fix lance
  mac99: fix segmentation fault on startup
  usb-linux.c: fix buffer overflow
  ARM host: fix generated blocks linking
  qemu serial: lost tx irqs (affecting FreeBSD's new uart(4) driver)
  exec-all.h: increase MAX_OP_PER_INSTR to 96 from 64

Conflicts:
	net.c

Signed-off-by: Avi Kivity <avi@redhat.com>