]> git.proxmox.com Git - mirror_qemu.git/commitdiff
projects / mirror_qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1da005b a492892)
Merge remote-tracking branch 'pm-arm/for-upstream' into pm
authorEdgar E. Iglesias <edgar.iglesias@gmail.com>
Tue, 9 Aug 2011 17:16:43 +0000 (19:16 +0200)
committerEdgar E. Iglesias <edgar.iglesias@gmail.com>
Tue, 9 Aug 2011 17:16:43 +0000 (19:16 +0200)
1  2 
target-arm/cpu.h patch | diff1 | diff2 | blob | history
target-arm/helper.c patch | diff1 | diff2 | blob | history

diff --cc target-arm/cpu.h
Simple merge
diff --cc target-arm/helper.c
Simple merge
QEMU mirror