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)
1  2 
linux-user/main.c

Simple merge