Merge tag 'nios2-v4.2' of git://git.rocketboards.org/linux-socfpga-next