Merge commit '956a3e6bb7386de48b642d4fee11f7f86a2fcf9a' into upstream-merge

Merge commit '956a3e6bb7386de48b642d4fee11f7f86a2fcf9a' into upstream-merge

* commit '956a3e6bb7386de48b642d4fee11f7f86a2fcf9a': (52 commits)
  Compile pckbd only once
  linux-user: do not warn for missing pselect6
  tcg-ia64: Load GUEST_BASE into a register.
  tcg-ia64: Fix some register usage issues.
  tcg-hppa: Load GUEST_BASE as an immediate.
  tcg: Initialize the prologue after GUEST_BASE is fixed.
  alpha-linux-user: Fix sigprocmask.
  alpha-linux-user: Fix sigsuspend parameters.
  alpha-linux-user: Fix getxpid.
  alpha-linux-user: Fix pipe return mechanism.
  alpha-linux-user: Add correct sigaction constants.
  alpha-linux-user: Fix siginfo.si_addr for SIGSEGV and SIGBUS.
  alpha-linux-user: Fix brk error return.
  tcg-i386: Nuke trailing whitespace.
  tcg-i386: Use lea for three-operand add.
  tcg-i386: Tidy lea.
  tcg-i386: Tidy xchg.
  tcg-i386: Tidy multiply.
  tcg-i386: Tidy unary arithmetic.
  tcg-i386: Tidy setcc.
  ...

Conflicts:
	Makefile.objs
	Makefile.target
	hw/pc.c

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