Merge branch 'master' of github.com:openrisc/mor1kx into multicore

Conflicts:
	rtl/verilog/mor1kx_lsu_cappuccino.v