]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 210b3a7 09f085d)
Merge remote-tracking branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 14 Oct 2011 17:36:50 +0000 (12:36 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 14 Oct 2011 17:36:50 +0000 (12:36 -0500)
1  2 
hw/ide/core.c patch | diff1 | diff2 | blob | history

diff --cc hw/ide/core.c
Simple merge
Qemu copy for testing