Merge branch 'devel/for-linus-3.19' into stable/for-linus-3.19