Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into...
authorDave Airlie <airlied@redhat.com>
Thu, 6 Mar 2014 23:04:32 +0000 (09:04 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 6 Mar 2014 23:04:32 +0000 (09:04 +1000)
commitae693400bd2dd438f2bbacbb925233ba1dee9236
tree115f56a6a5214b18b68ecad489393452ea70fd85
parent7a4ee320cd33468e251f84631ff3b79fa6b6eb14
parentd13c46c67e546bb1dc1c4dc7c43e388d0119276b
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()
drivers/gpu/drm/armada/armada_drv.c