projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb820c0 bfcedc5)
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 patch | diff1 | diff2 | blob | history

diff --cc linux-user/main.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.