From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 8 Dec 2012 17:50:57 +0000 (+0000)
Subject: Merge branch 'master' of git.qemu-project.org:/pub/git/qemu
X-Git-Tag: v2.7.1~3880
X-Git-Url: https://git.proxmox.com/?p=mirror_qemu.git;a=commitdiff_plain;h=536b558f5896ebbd635b57fa393e82faaa32ad52

Merge branch 'master' of git.qemu-project.org:/pub/git/qemu

* '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
---

536b558f5896ebbd635b57fa393e82faaa32ad52