Merge branch 'topic/sirf' into for-linus