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

This commit is contained in:
Russell King 2013-10-18 16:00:02 +01:00
commit dfdba7fd60