diff options
| author |   Dave Airlie <airlied@redhat.com> | 2014-03-20 11:08:11 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-03-20 11:09:10 +1000 |
| commit | e84c20aff1ce7493bce26b75f1db363bb3f05979 (patch) | |
| tree | a04e109899142ce637b182f103cc9bfbdec18d1b /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | Merge branch 'topic/core-stuff' of git://git.freedesktop.org/git/drm-intel into drm-next (diff) | |
| download | linux-dev-e84c20aff1ce7493bce26b75f1db363bb3f05979.tar.xz linux-dev-e84c20aff1ce7493bce26b75f1db363bb3f05979.zip | |
drm/radeon/kms: merge conflicted badly
Not sure why git didn't flag this, but the result of automerge
from 3.14-rc7 screwed up the radeon init procedure.
Reported-by: Fireburn on #radeon
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions