]> git.proxmox.com Git - mirror_qemu.git/commitdiff
projects / mirror_qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 511c68d 19e6c50)
Merge branch 'master' of git.qemu-project.org:/pub/git/qemu
authorBlue Swirl <blauwirbel@gmail.com>
Sat, 8 Dec 2012 17:50:57 +0000 (17:50 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sat, 8 Dec 2012 17:50:57 +0000 (17:50 +0000)
* 'master' of git.qemu-project.org:/pub/git/qemu:
  target-mips: Fix incorrect shift for SHILO and SHILOV
  target-mips: Fix incorrect code and test for INSV
  xilinx_uartlite: Accept input after rx FIFO pop
  xilinx_uartlite: suppress "cannot receive message"
  xilinx_axienet: Implement R_IS behaviour


Trivial merge
QEMU mirror