Merge branches 'drm-devel' and 'component-for-driver' into armada-drm
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 11 Jul 2014 14:39:05 +0000 (15:39 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 11 Jul 2014 14:39:05 +0000 (15:39 +0100)

Trivial merge