From: Dave Airlie Date: Tue, 28 Jan 2014 23:38: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-rc1~47^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5bd4f8ab0443ea62be34b112eb78cafb6b3042d;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next Just one-liner which corrects a select statement for DRM_KMS_FB_HELPER which looks like it was missed in the initial merge. Based on 3.13. * 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox: (55 commits) DRM: armada: fix missing DRM_KMS_FB_HELPER select --- a5bd4f8ab0443ea62be34b112eb78cafb6b3042d