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