From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 8 May 2012 14:37:00 +0000 (-0500)
Subject: Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging
X-Git-Tag: v1.1-rc1~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=233ffa1653b49755e841efdccbd2ac63272ce0c8;p=thirdparty%2Fqemu.git

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

* riku/linux-user-for-upstream:
  linux-user: fix emulation of /proc/self/maps
  linux-user: Clean up interim solution for exit syscall
---

233ffa1653b49755e841efdccbd2ac63272ce0c8