| commit | a5bd4f8ab0443ea62be34b112eb78cafb6b3042d | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Wed Jan 29 09:38:32 2014 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Wed Jan 29 09:38:32 2014 +1000 |
| tree | df3357914d967c2cf4619dbd14f4609daf406a15 | |
| parent | dee13f12f6ab0c0927adf9168dfc84da93fc9f13 [diff] | |
| parent | bed86f15bdc23436fb30d09e2faa3dfb7d3834e1 [diff] |
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