Merge tag 'socfpga_updates_for_3.15_v2' of git://git.rocketboards.org/linux-socfpga...