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

1  2 
drivers/gpu/drm/armada/armada_drv.c

Simple merge