Merge tag 'nios2-fix-4.0-rc4' of git://git.rocketboards.org/linux-socfpga-next