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