Merge branch 'patches_for_v3.6' into v4l_for_linus