Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into...
authorDave Airlie <airlied@redhat.com>
Tue, 28 Jan 2014 23:38:32 +0000 (09:38 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 28 Jan 2014 23:38:32 +0000 (09:38 +1000)
Just one-liner which corrects a select statement for DRM_KMS_FB_HELPER
which looks like it was missed in the initial merge.  Based on 3.13.

* 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox: (55 commits)
  DRM: armada: fix missing DRM_KMS_FB_HELPER select


Trivial merge