Merge branch 'rmobile/urgent' into rmobile-fixes-for-linus