Merge branches 'drm-devel' and 'component-for-driver' into armada-drm
authorRussell King <[email protected]>
Fri, 11 Jul 2014 14:39:05 +0000 (15:39 +0100)
committerRussell King <[email protected]>
Fri, 11 Jul 2014 14:39:05 +0000 (15:39 +0100)

Trivial merge