Merge remote-tracking branch 'qemu/master'
commitbbbfabab1cbf87889999b25c84d6bf0ac3e85632
authorStefan Weil <sw@weilnetz.de>
Wed, 18 Jun 2014 18:02:55 +0000 (18 20:02 +0200)
committerStefan Weil <sw@weilnetz.de>
Wed, 18 Jun 2014 18:02:55 +0000 (18 20:02 +0200)
tree197e1360476c5f17708bbfc05beebbc14e7bfa8f
parentc7d985c025876d19208743ba06d3d55ee9e4e0b3
parent2edaf21b939eb3b7f058fbc3cb7f7e14d6262486
Merge remote-tracking branch 'qemu/master'
MAINTAINERS
cpus.c
exec.c
memory.c