Merge branches 'drm-3.12' and 'tda998x-3.12' into drm-tda998x-3.12
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 18 Oct 2013 15:00:02 +0000 (16:00 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 18 Oct 2013 15:00:02 +0000 (16:00 +0100)

Trivial merge