Merge branch 'staging/for_v3.4' into v4l_for_linus