Merge branch 'patchwork' into v4l_for_linus