]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
Merge remote-tracking branch 'agraf/s390-for-upstream-1.1' into HEAD
authorMichael Roth <mdroth@linux.vnet.ibm.com>
Tue, 10 Jul 2012 19:08:37 +0000 (14:08 -0500)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Tue, 10 Jul 2012 19:08:37 +0000 (14:08 -0500)

Trivial merge