Merge branch 'upstream-merge' into next

Merge branch 'upstream-merge' into next

* upstream-merge: (72 commits)
  sparc64: fix TT_WOTHER value
  sparc64: fix mmu demap operand typo
  Update to a hopefully more future proof FSF address
  Trim unnecessary includes
  mc146818rtc: remove #ifdef DEBUG_CMOS.
  apm: remove #ifdef DEBUG.
  acpi_piix4: remove #ifdef DEBUG.
  pm_smbus: remove #ifdef DEBUG.
  pci hotadd, acpi_piix4: remove global variables
  pci hotplug: add argument to pci hot plug callback.
  acpi_piix4: qdevfy.
  rtc: make rtc_xxx accept/return ISADevice instead of RTCState.
  pc: move rtc declarations from pc.h into a dedicated header file.
  pc: split out piix specific part from pc.c into pc_piix.c
  pc: split out pci device init from pc_init1() into pc_pci_device_init()
  pc: split out basic device init from pc_init1() into pc_basic_device_init()
  pc: split out vga initialization from pc_init1() into pc_vga_init().
  pc: split out memory allocation from pc_init1() into pc_memory_init()
  pc: split out cpu initialization from pc_init1() into pc_cpus_init().
  pc: make pc_init1() not refer ferr_irq directly.
  ...

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