Merge branch 'staging/for_v3.7' into v4l_for_linus