diff options
| author |   Dave Airlie <airlied@redhat.com> | 2015-10-16 10:10:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-10-16 10:25:28 +1000 |
| commit | 48f87dd146a480c723774962eca675873a8aa1da (patch) | |
| tree | 71461989ebe8a20258ca4b0be341b755594a2b0b /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | Merge tag 'topic/drm-misc-2015-10-08' of git://anongit.freedesktop.org/drm-intel into drm-next (diff) | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| download | wireguard-linux-48f87dd146a480c723774962eca675873a8aa1da.tar.xz wireguard-linux-48f87dd146a480c723774962eca675873a8aa1da.zip | |
Merge commit '06d1ee32a4d25356a710b49d5e95dbdd68bdf505' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
Backmerge the drm-fixes pull from Linus's tree into drm-next.
This is to fix some conflicts and make future pulls cleaner
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions