diff options
author | Blue Swirl <blauwirbel@gmail.com> | 2012-12-08 17:50:57 +0000 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2012-12-08 17:50:57 +0000 |
commit | 536b558f5896ebbd635b57fa393e82faaa32ad52 (patch) | |
tree | 61756309c1d8f338f943f69bfbe6e6e50128da92 /uri.h | |
parent | 511c68d3af626cb0a39034cb77e7ac64d3a26c0c (diff) | |
parent | 19e6c50d2d843220efbdd3b2db21d83c122c364a (diff) | |
download | qemu-536b558f5896ebbd635b57fa393e82faaa32ad52.zip qemu-536b558f5896ebbd635b57fa393e82faaa32ad52.tar.gz qemu-536b558f5896ebbd635b57fa393e82faaa32ad52.tar.bz2 |
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
Diffstat (limited to 'uri.h')
0 files changed, 0 insertions, 0 deletions