Merge tag 'v3.18-rc1' into v4l_for_linus