]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
Merge branch 'linux-user-for-0.14' of git://gitorious.org/qemu-maemo/qemu
authorJustin M. Forbes <jforbes@redhat.com>
Mon, 14 Feb 2011 18:11:43 +0000 (12:11 -0600)
committerJustin M. Forbes <jforbes@redhat.com>
Mon, 14 Feb 2011 18:11:43 +0000 (12:11 -0600)

Trivial merge