Merge commit 'e61ab1da7e98357da47c54d8f893b9bd6ff2f7f9' into upstream-merge

Merge commit 'e61ab1da7e98357da47c54d8f893b9bd6ff2f7f9' into upstream-merge

* commit 'e61ab1da7e98357da47c54d8f893b9bd6ff2f7f9': (47 commits)
  qemu-ga: Implement alternative to O_ASYNC
  main-loop: Calculate poll timeout using timeout argument
  vga: Don't switch to 1 x 1 character text screen
  memory: move functions is_romd and section_addr to memory API
  cputlb: prepare private memory API for public consumption
  cputlb: move TLB handling to a separate file
  exec: prepare for splitting
  Drop darwin-user
  configure: add '--disable-cocoa' switch
  raw-posix: Do not use CONFIG_COCOA macro
  prep: Move int-ack register from PReP to Raven PCI emulation
  Makefile: Simplify compilation of target-*/cpu.c
  target-mips: Start QOM'ifying CPU init
  target-mips: QOM'ify CPU
  target-m68k: Add QOM CPU subclasses
  target-m68k: Start QOM'ifying CPU init
  target-m68k: QOM'ify CPU reset
  target-m68k: QOM'ify CPU
  target-sh4: Start QOM'ifying CPU init
  target-sh4: QOM'ify CPU reset
  ...

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