Merge branch 'master' of git://git.sv.gnu.org/qemu

Merge branch 'master' of git://git.sv.gnu.org/qemu

* 'master' of git://git.sv.gnu.org/qemu: (41 commits)
  Remove unused variable
  ETRAX: Removed unused struct entry and fixed Windows build.
  Add common BusState
  Fix lance segfaults
  Avoid errors when curl-config does not exist
  bios: Use the correct mask to size the PCI option ROM BAR
  x86: Add support for resume flag
  net: Fix dump time stamps
  Add HTTP protocol using curl v6
  USB serial device support
  serial: fix lost character after sysrq
  usb-serial: implement break event.
  slirp: Reassign same address to same DHCP client
  kvm: x86: Save/restore KVM-specific CPU states
  kvm: Rework VCPU reset
  Introduce reset notifier order
  kvm: Fix framebuffer dirty log sync
  kvm: Add missing bits to support live migration
  kvm: Rework dirty bitmap synchronization
  kvm: Fix dirty log temporary buffer size
  ...

Conflicts:
	Makefile
	configure
	exec.c
	hw/ioapic.c
	hw/pc.c
	pc-bios/bios.bin
	target-i386/machine.c
	vl.c

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