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

arch/nios2/cpu/cpu.c

arch/nios2/cpu/start.S

arch/nios2/include/asm/global_data.h

arch/nios2/include/asm/io.h

common/board_f.c

common/cmd_bdinfo.c

configs/nios2-generic_defconfig

drivers/misc/altera_sysid.c

drivers/net/altera_tse.c

drivers/net/altera_tse.h

drivers/serial/altera_jtag_uart.c

drivers/serial/altera_uart.c

drivers/spi/altera_spi.c

drivers/timer/altera_timer.c

include/configs/nios2-generic.h