Merge branch 'qemu-cvs'

Merge branch 'qemu-cvs'

* qemu-cvs: (135 commits)
  Use firmware configuration instead of NVRAM (initial patch by Aurelien Jarno)
  Add new entries to firmware configuration device
  Rename _BSD to HOST_BSD so that it's more obvious that it's defined by configure
  target-mips: remove dead code
  target-mips: rename helpers from do_ to helper_
  do not pretend to support low voltage operation
  Fix correct reset value for ARM CP15 c1 auxiliary control register
  Work around QEMU GDB stub suboptimality
  Fix off-by-one errors for Altivec and SPE registers
  Use C99 initializers for BlockDriver methods
  clean build: Fix remaining m68k warnings
  clean build: Fix arm build warnings
  arm: Fix gic_irq_state.level bitfield type
  target-ppc: move the CD-ROM drive to the second IDE
  ppc_oldworld: swap the MACIO and CMD646 IDE controllers
  Use a dedicated function to request exit from execution loop
  Fix texinfo syntax errors.
  Disable BAT for 970
  Fix mfcr on ppc64-softmmu
  Keep SLB in-CPU
  ...

Conflicts:
	qemu/configure
	qemu/cpu-defs.h
	qemu/exec.c
	qemu/hw/pci-hotplug.c
	qemu/monitor.c
	qemu/net.c
	qemu/pc-bios/Makefile
	qemu/pc-bios/bios.bin
	qemu/qemu-tool.c
	qemu/sysemu.h
	qemu/vl.c

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