Merge branch 'v4l_for_linus' into staging/for_v3.6