From: Dave Airlie <airlied@redhat.com>
Date: Thu, 6 Mar 2014 23:04:32 +0000 (+1000)
Subject: Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into... 
X-Git-Tag: firefly_0821_release~176^2~4325^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ae693400bd2dd438f2bbacbb925233ba1dee9236;p=firefly-linux-kernel-4.4.55.git

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

fix for kfifo api change.
* 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox:
  DRM: armada: fix use of kfifo_put()
---

ae693400bd2dd438f2bbacbb925233ba1dee9236