]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'pmaydell/omap-for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Sep 2011 13:00:00 +0000 (08:00 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Sep 2011 13:00:00 +0000 (08:00 -0500)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge