Merge branch 'stable_0_10' of git://git.sv.gnu.org/qemu into maint/2.6.30

Merge branch 'stable_0_10' of git://git.sv.gnu.org/qemu into maint/2.6.30

* 'stable_0_10' of git://git.sv.gnu.org/qemu: (21 commits)
  block-vpc: Don't silently create smaller image than requested (Kevin Wolf)
  Regenerate BIOS for stable branch
  Fix non-ACPI Timer Interrupt Routing (Beth Kon)
  hpet: Fix emulation of HPET_TN_SETVAL (Jan Kiszka)
  kvm: Fix cpuid initialization (Jan Kiszka)
  qcow2 corruption: Fix alloc_cluster_link_l2 (Kevin Wolf)
  Free VLANClientState using qemu_free() (Mark McLoughlin)
  Introduce VLANClientState::cleanup() (Mark McLoughlin)
  Use NICInfo::model for eepro100 savevm ID string (Mark McLoughlin)
  Add unregister_savevm() (Mark McLoughlin)
  Remove NICInfo from e1000 and mipsnet state (Mark McLoughlin)
  Remove some useless malloc() checking (Mark McLoughlin)
  Don't fail PCI hotplug if no NIC model is supplied (Mark McLoughlin)
  Fix error handling in net_client_init() (Mark McLoughlin)
  struct iovec is now universally available (Mark McLoughlin)
  Remove stray GSO code from virtio_net (Mark McLoughlin)
  Recognise evdev(xx)_aliases(yy) and xfree86(xx)_aliases(yy) as keymap names.
  Make PCI config status register read-only
  Fix crash on resolution change -> screen dump -> vga redraw (Avi Kivity)
  Update version for release
  ...

Conflicts:
	hw/eepro100.c
	hw/pcnet.c
	hw/rtl8139.c
	net.c
	pc-bios/bios.bin

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