Merge branch 'master' of git://git.denx.de/u-boot-nios

arch/nios2/cpu/cpu.c

arch/nios2/cpu/interrupts.c

arch/nios2/cpu/sysid.c

arch/nios2/cpu/u-boot.lds

arch/nios2/include/asm/nios2.h

board/altera/common/epled.c

board/altera/nios2-generic/Makefile

board/altera/nios2-generic/custom_fpga.h

board/altera/nios2-generic/nios2-generic.c

board/altera/nios2-generic/text_base.S

board/altera/nios2-generic/u-boot.lds

drivers/serial/altera_jtag_uart.c

drivers/serial/altera_uart.c

drivers/serial/opencores_yanu.c

include/configs/nios2-generic.h

include/nios2-io.h

include/nios2-yanu.h