Merge branch 'drm-tda998x-3.12-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox...
authorDave Airlie <airlied@redhat.com>
Wed, 23 Oct 2013 09:09:56 +0000 (10:09 +0100)
committerDave Airlie <airlied@redhat.com>
Wed, 23 Oct 2013 09:09:56 +0000 (10:09 +0100)
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


Trivial merge