Merge tag 'mvebu-soc-3.17-4' of git://git.infradead.org/linux-mvebu into next/soc