Merge commit '
f6f3fbcab0c36f17ea63573ed4d21816a09c978e' into upstream-merge
* commit '
f6f3fbcab0c36f17ea63573ed4d21816a09c978e':
qemu: memory notifiers
tcg/mips: fix crash in tcg_out_qemu_ld()
target-sh4: MMU: separate execute and read/write permissions
target-sh4: MMU: fix store queue addresses
target-sh4: MMU: remove dead code
target-sh4: MMU: reduce the size of a TLB entry
target-sh4: MMU: optimize UTLB accesses
target-sh4: MMU: fix ITLB priviledge check
target-sh4: MMU: simplify call to tlb_set_page()
target-sh4: MMU: fix mem_idx computation
sh7750: handle MMUCR TI bit
tcg/mips: implement setcond2
tcg/mips: implement setcond
configure: fix the static compilation for sdl
target-arm: refactor cp15.c13 register access
linux-user: remove signal handler before calling abort()
fix locking error with current_tb
linux-user: adapt uname machine to emulated CPU
Fix incoming migration with iothread
Conflicts:
exec.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>