From: Dave Airlie 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: v3.14-rc6~25^2~3 X-Git-Url: http://git.agner.ch/gitweb/?p=linux.git;a=commitdiff_plain;h=ae693400bd2dd438f2bbacbb925233ba1dee9236 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