Merge tag 'fixes-for-v3.18-rc2' of https://github.com/rjarzmik/linux into fixes