From: Dave Airlie <airlied@redhat.com>
Date: Wed, 23 Oct 2013 09:09:56 +0000 (+0100)
Subject: Merge branch 'drm-tda998x-3.12-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox... 
X-Git-Tag: firefly_0821_release~176^2~4694^2~163
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9e3396ae42d52c5cf4064af3e7c1baffb039ff54;p=firefly-linux-kernel-4.4.55.git

Merge branch 'drm-tda998x-3.12-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next

Fix build on non-ARM
* 'drm-tda998x-3.12-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox:
  DRM: Armada: depend on ARM
---

9e3396ae42d52c5cf4064af3e7c1baffb039ff54