Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging
commitcd59dd8734bebe5bd06be8a3fa79a9f4facf6633
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 27 Jun 2011 16:26:47 +0000 (27 11:26 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 27 Jun 2011 16:26:47 +0000 (27 11:26 -0500)
treee533ec4ccc42112dd6a297ed431350e35c49c4bf
parentbb820c03e2d638038fd48f42ee71e4004e55aba8
parentbfcedc572bb77f3d21cd3a297b4215389a2f7df4
Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging
linux-user/main.c