Merge branch 'component-for-staging' of git://ftp.arm.linux.org.uk/~rmk/linux-arm...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 8 Jul 2014 01:41:23 +0000 (18:41 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 8 Jul 2014 01:41:23 +0000 (18:41 -0700)
commit4aa42291b00ea3963c88d38c32293a1856534976
tree8616039e88569ca5c1fe6be4c3c7a44830e26bc6
parentc1a567d31b5488f4593eae7ca215264947b355ca
parent9e5e2ffda320bacb761e4812e3ef7a7decd592a9
Merge branch 'component-for-staging' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into staging-next

Russell writes:

This updates imx-drm for the recently merged updates to the component
helper, and as such is based upon the previously pulled updates
(including the recent fix) into the the driver tree.