]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5db070e a57d23e)
Merge branch 'trivial-patches' of git://repo.or.cz/qemu/stefanha
authorAurelien Jarno <aurelien@aurel32.net>
Mon, 23 May 2011 20:36:17 +0000 (22:36 +0200)
committerAurelien Jarno <aurelien@aurel32.net>
Mon, 23 May 2011 20:36:17 +0000 (22:36 +0200)
* 'trivial-patches' of git://repo.or.cz/qemu/stefanha:
  Fix typos in comments (chek -> check)
  hw/sd.c: Don't complain about SDIO commands CMD52/CMD53
  hw/realview.c: Remove duplicate #include line
  piix_pci: fix piix3_set_irq_pic()

1  2 
exec.c patch | diff1 | diff2 | blob | history

diff --cc exec.c
Simple merge
Qemu copy for testing