Merge tag 'mvebu-fixes-3.18' of git://git.infradead.org/linux-mvebu into fixes