Merge branch 'linux-user-for-upstream' into master-merge2
authorRiku Voipio <riku.voipio@nokia.com>
Mon, 20 Apr 2009 14:35:29 +0000 (17:35 +0300)
committerRiku Voipio <riku.voipio@nokia.com>
Mon, 20 Apr 2009 14:38:49 +0000 (17:38 +0300)
commit0cb5fb3d4855afe31e41c295ff4ac91132253f98
treea621039153197a7033f7da2332fabd77575e455b
parentbf8e5c7be37f9b952a53590cf702392e6e8a0f1c
parentaac6f545df612b5bd80139972af64df7a4567304
Merge branch 'linux-user-for-upstream' into master-merge2

Conflicts:

linux-user/main.c
exec.c
linux-user/main.c
linux-user/syscall.c