tree e533ec4ccc42112dd6a297ed431350e35c49c4bf
parent bb820c03e2d638038fd48f42ee71e4004e55aba8
parent bfcedc572bb77f3d21cd3a297b4215389a2f7df4
author Anthony Liguori <aliguori@us.ibm.com> 1309192007 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1309192007 -0500

Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging