Merge branch 'socfpga/soc' into next/soc