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)
commit9e3396ae42d52c5cf4064af3e7c1baffb039ff54
tree36da939c4cadf3a53bfd2177a97530b3f26a860a
parent5e4e3ba997af8c756c23ffaa86652d3a4df5bdfa
parent796c8e1c3439aa6f2aef75d767defa0243ed6ead
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