Merge commit '41a748265f4879b52b0e87ff9c93bed975163886' into upstream-merge
commit6eff3a191b5974c0fed4f0138b7c70b7d8e8ed47
authorMarcelo Tosatti <mtosatti@redhat.com>
Tue, 23 Aug 2011 13:01:09 +0000 (23 10:01 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Tue, 23 Aug 2011 13:01:09 +0000 (23 10:01 -0300)
treed14f432137d6cbe5b4a5570da574a3bcf2b47561
parent4b6cacdc5fb897cbc771e15e5b3799784916605e
parent41a748265f4879b52b0e87ff9c93bed975163886
Merge commit '41a748265f4879b52b0e87ff9c93bed975163886' into upstream-merge

* commit '41a748265f4879b52b0e87ff9c93bed975163886':
  Remove qemu_malloc/qemu_free

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Makefile
Makefile.objs
Makefile.target
hw/device-assignment.c
hw/extboot.c
hw/i8259.c
hw/msi.c
hw/msix.c
hw/pc.c
hw/testdev.c
qemu-kvm.c