Merge remote-tracking branch 'linuxtv/vsp1' into HEAD