tree d44de0b744eec6ae05a0271cb1d0945ad9ea2716
parent bea09f657f95219cc76f90b7eeaec4de77ab664e
parent 860329b2513cf754c5f7d5400f7bcf5dd1a44489
author Anthony Liguori <aliguori@us.ibm.com> 1316705401 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1316705401 -0500

Merge remote-tracking branch 'qemu-kvm-tmp/memory/core' into staging