projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47bf05d fb8f4ce)
Merge remote-tracking branch 'kraxel/usb.22' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 4 Aug 2011 22:10:36 +0000 (17:10 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 4 Aug 2011 22:10:36 +0000 (17:10 -0500)
1  2 
Makefile.objs patch | diff1 | diff2 | blob | history
qemu-common.h patch | diff1 | diff2 | blob | history

diff --cc Makefile.objs
Simple merge
diff --cc qemu-common.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.