From: Dave Airlie <airlied@redhat.com>
Date: Fri, 15 May 2015 05:24:41 +0000 (+1000)
Subject: Merge branch 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into... 
X-Git-Tag: firefly_0821_release~176^2~1470^2~55
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dde10068e1a4798fa44e68a5d08b5dfe3602cbba;p=firefly-linux-kernel-4.4.55.git

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
---

dde10068e1a4798fa44e68a5d08b5dfe3602cbba