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

Conflicts:
	rtl/verilog/mor1kx_cpu_cappuccino.v
	rtl/verilog/mor1kx_ctrl_cappuccino.v
	rtl/verilog/mor1kx_lsu_cappuccino.v