Merge commit '055403b2a72729497fb58e0c6293547e767679d3' into upstream-merge
commit47f1b51a79b2c7b7591e06e7fb01d5c9cc30f0b8
authorAvi Kivity <avi@redhat.com>
Sun, 14 Nov 2010 14:08:38 +0000 (14 16:08 +0200)
committerAvi Kivity <avi@redhat.com>
Sun, 14 Nov 2010 14:10:21 +0000 (14 16:10 +0200)
tree35257851ba596c79f699430f24c089d2fdcbe9a0
parent9887e4e27e04799c8a1328dae9d7d54b34fda825
parent055403b2a72729497fb58e0c6293547e767679d3
Merge commit '055403b2a72729497fb58e0c6293547e767679d3' into upstream-merge

* commit '055403b2a72729497fb58e0c6293547e767679d3':
  exec: Use fprintf_function for dump_exec_info (format checking)
  tcg: Use fprintf_function (format checking)
  Add fprintf_function for function pointers to fprintf-like functions
  Mov muldiv64 to qemu-common.h (Thus unbreaking gus)

Conflicts:
exec.c

Signed-off-by: Avi Kivity <avi@redhat.com>
exec.c
qemu-common.h