]> 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: 20c2222 ee66cd7 590dbb4)
Merge branches 'apohw', 'can-pci' and 'mf624' into merged-2.3.0 merged-2.3.0
authorPavel Pisa <pisa@cmp.felk.cvut.cz>
Tue, 28 Apr 2015 00:45:35 +0000 (02:45 +0200)
committerPavel Pisa <pisa@cmp.felk.cvut.cz>
Tue, 28 Apr 2015 00:45:35 +0000 (02:45 +0200)
1  2  3 
default-configs/pci.mak patch | diff1 | diff2 | diff3 | blob | history

diff --cc default-configs/pci.mak
Simple merge
Virtual HW used in A0B36APO subject