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