Merge branch 'socfpga/hw' into next/soc