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)
commit2f2d27026c4728533d60ac0b7b98df18f6b2cd0c
tree3c4e367bb569842a522827e75a25b918cae343b1
parent42e62ba7a484e12a77b9e330a29bbf7c99d3e60e
parent7e435aad38083f378ba7889d8b8fdcdbfe7088e7
parentb509cc802239a8b5ba7d1d2cc5adfb9d984b7ed8
Merge branches 'drm-devel' and 'component-for-driver' into armada-drm