projects / linux-2.6-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dee13f1 bed86f1)
Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into...
authorDave Airlie <airlied@redhat.com>
Tue, 28 Jan 2014 23:38:32 +0000 (09:38 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 28 Jan 2014 23:38:32 +0000 (09:38 +1000)
commita5bd4f8ab0443ea62be34b112eb78cafb6b3042d
treedf3357914d967c2cf4619dbd14f4609daf406a15tree | snapshot
parentdee13f12f6ab0c0927adf9168dfc84da93fc9f13commit | diff
parentbed86f15bdc23436fb30d09e2faa3dfb7d3834e1commit | 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
Linux 6.x block layer and io_uring tree(s)