Merge commit 'c1b0b93b06ab026ef45ae02d0ee7557741910637' into upstream-merge
commit031871007b88a18309807c35568f135a49be60fe
authorAvi Kivity <avi@redhat.com>
Sun, 14 Nov 2010 14:47:58 +0000 (14 16:47 +0200)
committerAvi Kivity <avi@redhat.com>
Sun, 14 Nov 2010 14:47:58 +0000 (14 16:47 +0200)
treef22c30334e4d922f6cdfdcbd0c2a3f938b3baa15
parent338be4505b537f50e345254982e4bf127194dd0c
parentc1b0b93b06ab026ef45ae02d0ee7557741910637
Merge commit 'c1b0b93b06ab026ef45ae02d0ee7557741910637' into upstream-merge

* commit 'c1b0b93b06ab026ef45ae02d0ee7557741910637':
  Move QEMU OS dependant library functions to OS specific files
  target-xxx: Use fprintf_function (format checking)

Conflicts:
osdep.c

Signed-off-by: Avi Kivity <avi@redhat.com>
Makefile
Makefile.objs
cpus.c
oslib-posix.c
target-i386/cpu.h
target-i386/cpuid.c
target-i386/helper.c
target-ppc/cpu.h