diff options
author | 2014-01-29 09:38:32 +1000 | |
---|---|---|
committer | 2014-01-29 09:38:32 +1000 | |
commit | a5bd4f8ab0443ea62be34b112eb78cafb6b3042d (patch) | |
tree | df3357914d967c2cf4619dbd14f4609daf406a15 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'omapdrm-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next (diff) | |
parent | DRM: armada: fix missing DRM_KMS_FB_HELPER select (diff) | |
download | linux-dev-a5bd4f8ab0443ea62be34b112eb78cafb6b3042d.tar.xz linux-dev-a5bd4f8ab0443ea62be34b112eb78cafb6b3042d.zip |
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
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions