Merge branches 'drm-3.12' and 'tda998x-3.12' into drm-tda998x-3.12