]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
projects / lisovros / qemu_apohw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21ffd18 57c3229)
Merge remote branch 'mst/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 17 May 2010 17:41:39 +0000 (12:41 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 17 May 2010 17:41:39 +0000 (12:41 -0500)
1  2 
hw/pci.c patch | diff1 | diff2 | blob | history

diff --cc hw/pci.c
Simple merge
Virtual HW used in A0B36APO subject