callr.s

Conflicts:
	hardware/config/default.xml
	hardware/emulator.cpp
	hardware/src/io/CpuInfo.scala
	hardware/src/io/Device.scala
	hardware/src/io/Timer.scala
	hardware/src/io/Uart.scala
	hardware/src/patmos/Constants.scala
	hardware/src/patmos/Decode.scala
	hardware/src/patmos/InOut.scala
	hardware/src/patmos/connections.scala
	hardware/src/util/Config.scala
	simulator/include/binary-formats.h
	simulator/src/assembler.cc
	simulator/src/binary-formats.cc
	simulator/src/decoder.cc
	simulator/src/simulation-core.cc