Merge branch 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into...
authorDave Airlie <airlied@redhat.com>
Fri, 15 May 2015 05:24:41 +0000 (15:24 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 15 May 2015 05:24:41 +0000 (15:24 +1000)
commitdde10068e1a4798fa44e68a5d08b5dfe3602cbba
tree5afccf8d62b853ab8aa7b31641ebaf16fd8afe0c
parent72a81683a8feac3c67bac24dfd88f81bac077be0
parent38bf3aee3ec7b5b264b701da14114a618cddd1a1
Merge branch 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next

some minor cleanups
* 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  drm/armada: armada_drv: Remove unused function
  drm/armada: armada_output: Remove some unused functions
drivers/gpu/drm/armada/armada_drv.c
drivers/gpu/drm/armada/armada_output.h