Merge commit 'fc0bdd995ca36a34cc576ee706df239dd5ff79a9' into upstream-merge

Merge commit 'fc0bdd995ca36a34cc576ee706df239dd5ff79a9' into upstream-merge

* commit 'fc0bdd995ca36a34cc576ee706df239dd5ff79a9':
  acpi: split out piix4 smbus routines from acpi.c into pm_smbus.c
  mc146818rtc: Register vmstate via qdev
  fdc: Register vmstate via qdev
  serial: Register vmstate via qdev
  vmstate: Add support for alias ID
  vmstate: Drop unused post_save handler
  sh: sm501: add 2D engine support
  tmp105: update the register in post_load where it needs updating.
  cpus: add one 'const'
  e1000: make some tables 'const'
  ide: make a table 'const'
  vga: make some tables 'const'
  Compile virtio-9p-debug and virtio-9p-local once
  Update SeaBIOS
  pckbd: don't use any static state
  apb: don't use any static state
  target-sparc: Fix wrong printf argument
  Update OpenBIOS images to r771
  kvm: fix 80000001.EDX supported bit filtering

Conflicts:
	Makefile.target

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