From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 9 Jul 2012 14:51:06 +0000 (-0500)
Subject: Merge remote-tracking branch 'stefanha/trivial-patches' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8665817e892c1ed6cec415a65b56eb9944894fbc;p=qemu.git

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

* stefanha/trivial-patches:
  configure: Remove help for --disable-vnc-thread, --enable-vnc-thread
  cpu-common.h: Remove a pointless ifndef CONFIG_USER_ONLY
  cpu-common.h: Remove unnecessary guard on including targphys.h
---

8665817e892c1ed6cec415a65b56eb9944894fbc