Re: [GIT PULL for v3.12-rc1] media updates

2013-09-05 Thread Linus Torvalds
On Thu, Sep 5, 2013 at 7:24 AM, Mauro Carvalho Chehab wrote: > > Also, a trivial conflict at s5p_mfc_dec.c and s5p_mfc_enc.c will happen as > a macro name got renamed from IS_MFCV6 to IS_MFCV6_PLUS. I did an "ugly merge" when fixing that conflict up, because the stupid code at the conflict site d

[GIT PULL for v3.12-rc1] media updates

2013-09-05 Thread Mauro Carvalho Chehab
Hi Linus, Please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media v4l_for_linus This series contain: - Exynos s5p-mfc driver got support for VP8 encoder; - Some SoC drivers gained support for asynchronous registration (needed for DT);