diff options
| author |   Dave Airlie <airlied@redhat.com> | 2015-04-09 07:48:27 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-04-09 07:48:27 +1000 |
| commit | 1d8ac08d498d579aae36221a80b4b724b2f52f39 (patch) | |
| tree | 3177ed7b82edbb34055da95c50b418db5cd4ba60 /tools/perf/ui/browsers/annotate.c | |
| parent | Merge tag 'imx-drm-fixes-2015-03-31' of git://git.pengutronix.de/git/pza/linux into drm-next (diff) | |
| parent | Linux 4.0-rc7 (diff) | |
| download | linux-dev-1d8ac08d498d579aae36221a80b4b724b2f52f39.tar.xz linux-dev-1d8ac08d498d579aae36221a80b4b724b2f52f39.zip | |
Merge tag 'v4.0-rc7' into drm-next
Linux 4.0-rc7
Requested by Alex for fixes -next needs.
Conflicts:
drivers/gpu/drm/i915/intel_sprite.c
Diffstat (limited to 'tools/perf/ui/browsers/annotate.c')
0 files changed, 0 insertions, 0 deletions