Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 8 May 2012 14:37:00 +0000 (09:37 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 8 May 2012 14:37:00 +0000 (09:37 -0500)
* riku/linux-user-for-upstream:
  linux-user: fix emulation of /proc/self/maps
  linux-user: Clean up interim solution for exit syscall


Trivial merge