From: Anthony Liguori <aliguori@amazon.com>
Date: Fri, 24 Jan 2014 23:52:44 +0000 (-0800)
Subject: Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~1122
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0169c511554cb0014a00290b0d3d26c31a49818f;p=sdk%2Femulator%2Fqemu.git

Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

* qemu-kvm/uq/master:
  kvm: always update the MPX model specific register
  KVM: fix addr type for KVM_IOEVENTFD
  KVM: Retry KVM_CREATE_VM on EINTR
  mempath prefault: fix off-by-one error
  kvm: x86: Separately write feature control MSR on reset
  roms: Flush icache when writing roms to guest memory
  target-i386: clear guest TSC on reset
  target-i386: do not special case TSC writeback
  target-i386: Intel MPX

Conflicts:
	exec.c

aliguori: fix trivial merge conflict in exec.c

Signed-off-by: Anthony Liguori <aliguori@amazon.com>
---

0169c511554cb0014a00290b0d3d26c31a49818f