Merge branch 'devel-for-v3.10' into v4l_for_linus