Merge remote-tracking branch 'stefanha/trivial-patches' into staging

Conflicts:
	cpu-all.h

diff --cc cpu-exec.c
Simple merge

diff --cc hw/pci.c
Simple merge

diff --cc target-cris/cpu.h
Simple merge